From a23234d59ce2c2be43ad392a2171e1846f7f650b Mon Sep 17 00:00:00 2001 From: JayPiKay Date: Mon, 28 Aug 2017 11:19:31 +0200 Subject: [PATCH 01/13] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e72b82a..d6ec665 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ image: gcc trigger_build: stage: deploy script: - - "curl -X POST -F token=-nr2owgsfXRbWXHByiv3 -F ref=REF_NAME https://git.goatpr0n.de/api/v4/projects/46/trigger/pipeline" + - "curl -X POST -F token=-nr2owgsfXRbWXHByiv3 -F ref=master https://git.goatpr0n.de/api/v4/projects/46/trigger/pipeline" build: stage: build From 4960f8e5e2b2d0042b715e2c904700ab971fc7f4 Mon Sep 17 00:00:00 2001 From: JayPiKay Date: Mon, 28 Aug 2017 11:25:38 +0200 Subject: [PATCH 02/13] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d6ec665..5d79535 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ image: gcc trigger_build: stage: deploy script: - - "curl -X POST -F token=-nr2owgsfXRbWXHByiv3 -F ref=master https://git.goatpr0n.de/api/v4/projects/46/trigger/pipeline" + - "curl -X POST -F token=KxfjoqGbMTBooVwKLDDX -F ref=master https://git.goatpr0n.de/api/v4/projects/46/trigger/pipeline" build: stage: build From 524a6eaf8f25f8cbc8d073e8cd8856c85aaccd0b Mon Sep 17 00:00:00 2001 From: JayPiKay Date: Mon, 28 Aug 2017 11:29:36 +0200 Subject: [PATCH 03/13] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5d79535..f8734f6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ image: gcc trigger_build: stage: deploy script: - - "curl -X POST -F token=KxfjoqGbMTBooVwKLDDX -F ref=master https://git.goatpr0n.de/api/v4/projects/46/trigger/pipeline" + - "curl -X POST -F token=a33d4391f12d6225892c0533d11c05 -F ref=master https://git.goatpr0n.de/api/v4/projects/46/trigger/pipeline" build: stage: build From ef428e0f2a31c3f8ce8b254520e446d14d891625 Mon Sep 17 00:00:00 2001 From: JayPiKay Date: Mon, 28 Aug 2017 11:36:37 +0200 Subject: [PATCH 04/13] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f8734f6..c9f1ff8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ image: gcc trigger_build: stage: deploy script: - - "curl -X POST -F token=a33d4391f12d6225892c0533d11c05 -F ref=master https://git.goatpr0n.de/api/v4/projects/46/trigger/pipeline" + - "curl -X POST -F token=KxfjoqGbMTBooVwKLDDX-F ref=master https://git.goatpr0n.de/api/v4/projects/46/trigger/pipeline" build: stage: build From 70f47fd2b5302c63c685258ced088bf76f66c997 Mon Sep 17 00:00:00 2001 From: JayPiKay Date: Mon, 28 Aug 2017 12:00:53 +0200 Subject: [PATCH 05/13] Update .gitlab-ci.yml --- .gitlab-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c9f1ff8..d0bdf0a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,13 +4,14 @@ # see https://hub.docker.com/_/gcc/ image: gcc -trigger_build: - stage: deploy - script: - - "curl -X POST -F token=KxfjoqGbMTBooVwKLDDX-F ref=master https://git.goatpr0n.de/api/v4/projects/46/trigger/pipeline" +#trigger_build: +# stage: deploy +# script: +# - "curl -X POST -F token=KxfjoqGbMTBooVwKLDDX-F ref=master https://git.goatpr0n.de/api/v4/projects/46/trigger/pipeline" build: stage: build + tags: gcc # instead of calling g++ directly you can also use some build toolkit like make # install the necessary build tools when needed before_script: From 66c86d381e1aef775941d5a524c90929a03b7c9d Mon Sep 17 00:00:00 2001 From: JayPiKay Date: Mon, 28 Aug 2017 12:01:44 +0200 Subject: [PATCH 06/13] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d0bdf0a..6147fa6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,8 @@ image: gcc build: stage: build - tags: gcc + tags: + - gcc # instead of calling g++ directly you can also use some build toolkit like make # install the necessary build tools when needed before_script: From 2218e7df28f22853aa67024e64e88989965ba0e3 Mon Sep 17 00:00:00 2001 From: JayPiKay Date: Mon, 28 Aug 2017 12:06:25 +0200 Subject: [PATCH 07/13] Update .gitlab-ci.yml --- .gitlab-ci.yml | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6147fa6..b1a9a8a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,10 +4,8 @@ # see https://hub.docker.com/_/gcc/ image: gcc -#trigger_build: -# stage: deploy -# script: -# - "curl -X POST -F token=KxfjoqGbMTBooVwKLDDX-F ref=master https://git.goatpr0n.de/api/v4/projects/46/trigger/pipeline" +stages: + - build build: stage: build @@ -23,12 +21,8 @@ build: paths: - lw12ctl # depending on your build setup it's most likely a good idea to cache outputs to reduce the build time - # cache: - # paths: - # - "*.o" - -# run tests using the binary built before -#test: -# stage: test -# script: -# - ./runmytests.sh + cache: + paths: + - "*.o" + only: + - tags From 3263a93bef39d7f0d128a6219a0de397e71b5b95 Mon Sep 17 00:00:00 2001 From: JayPiKay Date: Mon, 28 Aug 2017 13:34:32 +0200 Subject: [PATCH 08/13] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b1a9a8a..a5b9e07 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,6 +17,7 @@ build: - apt update && apt -y install libreadline-dev script: - gcc lw12.c lw12ctl -o lw12ctl + - ls -l artifacts: paths: - lw12ctl From 611741a5f0583cd70f77a37f67261a522fc42cd7 Mon Sep 17 00:00:00 2001 From: JayPiKay Date: Mon, 28 Aug 2017 13:51:03 +0200 Subject: [PATCH 09/13] Update .gitlab-ci.yml --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a5b9e07..41da48e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,9 +15,10 @@ build: # install the necessary build tools when needed before_script: - apt update && apt -y install libreadline-dev - script: + script: + - ls - gcc lw12.c lw12ctl -o lw12ctl - - ls -l + - ls artifacts: paths: - lw12ctl From a66fdf25962abc0944b7ba685f7639e14d2a89a5 Mon Sep 17 00:00:00 2001 From: JayPiKay Date: Mon, 28 Aug 2017 13:53:31 +0200 Subject: [PATCH 10/13] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 41da48e..097b8cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,9 +16,7 @@ build: before_script: - apt update && apt -y install libreadline-dev script: - - ls - - gcc lw12.c lw12ctl -o lw12ctl - - ls + - gcc lw12.c lw12ctl.c -o lw12ctl artifacts: paths: - lw12ctl From 8919f27f484c31ba6c63beca158eeafbfaccf9a7 Mon Sep 17 00:00:00 2001 From: JayPiKay Date: Mon, 28 Aug 2017 13:57:58 +0200 Subject: [PATCH 12/13] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 097b8cf..b2e1df7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,4 @@ -# This file is a template, and might need editing before it works on your project. -# use the official gcc image, based on debian +# Use the official gcc image, based on debian # can use verions as well, like gcc:5.2 # see https://hub.docker.com/_/gcc/ image: gcc From 95f10f1e154491b8fc3570d1411a46fc5a172412 Mon Sep 17 00:00:00 2001 From: JayPiKay Date: Mon, 28 Aug 2017 14:05:12 +0200 Subject: [PATCH 13/13] Update .gitlab-ci.yml: cmake added --- .gitlab-ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2e1df7..8a07ded 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,12 +10,11 @@ build: stage: build tags: - gcc - # instead of calling g++ directly you can also use some build toolkit like make - # install the necessary build tools when needed before_script: - - apt update && apt -y install libreadline-dev + - apt update && apt -y install libreadline-dev cmake script: - - gcc lw12.c lw12ctl.c -o lw12ctl + - cmake . + - make artifacts: paths: - lw12ctl