From b6e68e5a20f902e42cbad504b7fc2fb1786f5bb2 Mon Sep 17 00:00:00 2001
From: Grigoris Pavlakis <grigpavl@ece.auth.gr>
Date: Mon, 19 Aug 2019 11:32:35 +0000
Subject: [PATCH] Fix CI configuration
Fix missing script directive
Update .gitlab-ci.yml
Override image entrypoint to include '-c' argument
Revert previous override due to broken .gitlab-ci.yml
Remove -Werror argument
Update .gitlab-ci.yml
---
.gitlab-ci.yml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58594d74..7b26ab5d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: lightspot21/acubesat-ci
+image: lightspot21/acubesat-ci:latest
variables:
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
@@ -32,7 +32,7 @@ build:
# - cmake . -DCMAKE_CXX_FLAGS="-Werror -fdiagnostics-color=always"
# - make -j4
# - make clean
- - cmake . -DCMAKE_CXX_FLAGS="-Wall -Wextra -Werror -fdiagnostics-color=always" # Build again, but with more warnings
+ - cmake . -DCMAKE_CXX_FLAGS="-Wall -Wextra -fdiagnostics-color=always" # Build again, but with more warnings
- make -j4
tests:
@@ -75,7 +75,7 @@ vera:
before_script:
# - apt-get update -qq && apt-get install -y -qq vera++
- vera++ --version
- - cp ci/vera.profile /usr/lib/vera++/profiles/custom
+ - sudo cp ci/vera.profile /usr/lib/vera++/profiles/custom
script:
- ci/vera.sh
@@ -102,9 +102,9 @@ pages:
- public
variables:
GIT_SUBMODULE_STRATEGY: normal
- script:
+# script:
# - apt-get install -qq -y doxygen graphviz lcov
- after_script:
+ script:
- ./ci/pages_deploy.sh
- echo -e "\e[1;36mPublic directory contents\e[0m" && ls -l public/coverage # Print directory contents for debugging
artifacts:
--
GitLab