From e5493fa7155dc83fcece2e9ecc5631821dc28e59 Mon Sep 17 00:00:00 2001
From: Jan Reher <jreher@ep1.rub.de>
Date: Thu, 8 Aug 2019 13:30:18 +0200
Subject: [PATCH 1/5] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ae6b6cb..54036f8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,10 @@ build:
# install the necessary build tools when needed
# before_script:
# - apt update && apt -y install make autoconf
+ before_script:
+ - apt-get update --yes
+ - apt-get install --yes cmake
+
script:
- mkdir build
- cd build
--
GitLab
From 082ce86eb2bcddac5afbdb76ec11d4fa1ad5cfef Mon Sep 17 00:00:00 2001
From: Jan Reher <jreher@ep1.rub.de>
Date: Thu, 8 Aug 2019 13:43:20 +0200
Subject: [PATCH 2/5] 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 54036f8..0019dac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@
# 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
+image: msrd0/cmake-qt5
build:
stage: build
--
GitLab
From 17b05e04667e24f0f403433a5cfd4b67e8da8d3e Mon Sep 17 00:00:00 2001
From: Jan Reher <jreher@ep1.rub.de>
Date: Thu, 8 Aug 2019 13:44:04 +0200
Subject: [PATCH 3/5] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0019dac..038e600 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,9 +10,6 @@ build:
# install the necessary build tools when needed
# before_script:
# - apt update && apt -y install make autoconf
- before_script:
- - apt-get update --yes
- - apt-get install --yes cmake
script:
- mkdir build
--
GitLab
From 4d2f0b9ee84bcd81fcb7bf2e04b0ecc758215942 Mon Sep 17 00:00:00 2001
From: Jan Reher <jreher@ep1.rub.de>
Date: Thu, 8 Aug 2019 14:07:34 +0200
Subject: [PATCH 4/5] Update .gitlab-ci.yml
--
GitLab
From b0900e01eec33413e87065f2f61c2624ad284715 Mon Sep 17 00:00:00 2001
From: Jan Reher <jreher@ep1.rub.de>
Date: Thu, 8 Aug 2019 14:09:56 +0200
Subject: [PATCH 5/5] 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 038e600..41047eb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ build:
script:
- mkdir build
- cd build
- - cmake ..
+ - cmake3 ..
- make
# artifacts:
# paths:
--
GitLab