Commit a3b49301 authored by Emmanuel Promayon's avatar Emmanuel Promayon
Browse files

Merge branch 'bug/gitlab-runner-breaks-ci' into 'develop'

Bug/gitlab runner breaks ci

Closes #79

See merge request !103
parents 4d2c2b83 d50993e9
#!/bin/bash
if [ "$OS" == "win7" ]; then
# there is no docker on windows
CONTAINER_ID=0
......@@ -66,6 +65,8 @@ QT_VERSION=$(qmake --version | grep Qt | cut -f4 -d" " )
# output all information to report file
echo "Docker container id....... $CONTAINER_ID" > /tmp/report.txt
echo "Job....................... $CI_JOB_NAME" >> /tmp/report.txt
echo "PROJECT_SOURCE_DIR........ $PROJECT_SOURCE_DIR" >> /tmp/report.txt
echo "CI_PROJECT_DIR............ $CI_PROJECT_DIR" >> /tmp/report.txt
echo "Build Directory........... $PROJECT_BUILD_DIR" >> /tmp/report.txt
echo "Log Directory............. $PROJECT_LOG_DIR" >> /tmp/report.txt
echo "Branch.................... $CI_COMMIT_REF_NAME" >> /tmp/report.txt
......
......@@ -2,7 +2,13 @@
# Uncomment next line to print each bash command before it is executed
#set -x
# Path needs to use forward slashes
# This is ok on Linux but since gitlab-runner 11.7 on windows all path variables use backward slash instead of forward slash
# → Replace all backslash to forward slash
export PROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR//\\//}
echo "Job $CI_JOB_NAME"
echo "PROJECT_SOURCE_DIR=$PROJECT_SOURCE_DIR"
if ! grep -q TRIGGER_STAGE_BUILD "${PROJECT_LOG_DIR}/trigger-stage.txt"; then
echo "Job skipped as /build flag not in commit message and CAMITK_CI_STAGE < $STAGE_CONFIGURE";
......
#!/bin/bash
# Path needs to use forward slashes
# This is ok on Linux but since gitlab-runner 11.7 on windows all path variables use backward slash instead of forward slash
# → Replace all backslash to forward slash
export PROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR//\\//}
echo "Job $CI_JOB_NAME"
echo "PROJECT_SOURCE_DIR=$PROJECT_SOURCE_DIR"
if [ "$TRIGGER_STAGE_CHECK" == "false" ]; then
echo "Job skipped as /check flag not in commit message and CAMITK_CI_STAGE < $STAGE_CHECK";
......
......@@ -2,7 +2,13 @@
# Uncomment next line to print each bash command before it is executed
#set -x
# Path needs to use forward slashes
# This is ok on Linux but since gitlab-runner 11.7 on windows all path variables use backward slash instead of forward slash
# → Replace all backslash to forward slash
export PROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR//\\//}
echo "Job $CI_JOB_NAME"
echo "PROJECT_SOURCE_DIR=$PROJECT_SOURCE_DIR"
if ! grep -q TRIGGER_STAGE_CONFIGURE "${PROJECT_LOG_DIR}/trigger-stage.txt"; then
echo "Job skipped as /configure flag not in commit message and CAMITK_CI_STAGE < $STAGE_CONFIGURE";
......@@ -29,9 +35,8 @@ if [[ "$OS" != "win7" ]]; then
fi
echo "===== Running configure stage ====="
# there is no xvfb on windows
if [ "$OS" == "win7" ]; then
# there is no xvfb on windows
ctest -VV \
-DCTEST_SITE="$CDASH_SITE" \
-DCI_MODE="$CAMITK_CI_MODE" \
......@@ -40,7 +45,7 @@ if [ "$OS" == "win7" ]; then
-DCI_BUILD_SETTINGS="$COMPILER_CONFIG" \
-DCTEST_SOURCE_DIRECTORY="$PROJECT_SOURCE_DIR" \
-DCTEST_BINARY_DIRECTORY="$PROJECT_BUILD_DIR" \
-S $PROJECT_SOURCE_DIR/sdk/cmake/ctest/ci-configure.cmake > >(tee ${PROJECT_LOG_DIR}/configure.log) 2>&1
-S "$PROJECT_SOURCE_DIR/sdk/cmake/ctest/ci-configure.cmake" > >(tee ${PROJECT_LOG_DIR}/configure.log) 2>&1
else
ctest -VV \
-DCTEST_SITE="$CDASH_SITE" \
......
#!/bin/bash
# Path needs to use forward slashes
# This is ok on Linux but since gitlab-runner 11.7 on windows all path variables use backward slash instead of forward slash
# → Replace all backslash to forward slash
export PROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR//\\//}
echo "Job $CI_JOB_NAME"
echo "PROJECT_SOURCE_DIR=$PROJECT_SOURCE_DIR"
if ! grep -q TRIGGER_STAGE_COVERAGE "${PROJECT_LOG_DIR}/trigger-stage.txt"; then
echo "Job skipped as /coverage flag not in commit message and CAMITK_CI_STAGE < $STAGE_CONFIGURE";
......
......@@ -2,7 +2,13 @@
# Uncomment next line to print each bash command before it is executed
#set -x
# Path needs to use forward slashes
# This is ok on Linux but since gitlab-runner 11.7 on windows all path variables use backward slash instead of forward slash
# → Replace all backslash to forward slash
export PROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR//\\//}
echo "Job $CI_JOB_NAME"
echo "PROJECT_SOURCE_DIR=$PROJECT_SOURCE_DIR"
if ! grep -q TRIGGER_STAGE_TEST "${PROJECT_LOG_DIR}/trigger-stage.txt"; then
echo "Job skipped as /test flag not in commit message and CAMITK_CI_STAGE < $STAGE_CONFIGURE";
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment