diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 71967f814df7f636727b58a71e8798abfbdaab5a..bac84806a295fbe0834b75dbd501c0a7060daa62 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,15 +18,6 @@ variables: # The fetch strategy fails with LFS and GitLab GIT_STRATEGY: "clone" -before_script: - # Provision efficiently the local LFS cache before checkout - - git lfs fetch origin $CI_COMMIT_SHA - # Checkout the expected branch - - git checkout -f -q $CI_COMMIT_SHA - -after_script: - - python3 CI/cdash_handler.py $CI_COMMIT_SHA $CI_PROJECT_ID $CI_PROJECT_DIR $K8S_SECRET_CDASH - stages: - precheck - prepare @@ -48,6 +39,8 @@ fast-build: - export GIT_LFS_SKIP_SMUDGE=1 - git checkout -f -q $CI_COMMIT_SHA - python3 CI/check_twin_pipelines.py + after_script: + - python3 CI/cdash_handler.py $CI_COMMIT_SHA $CI_PROJECT_ID $CI_PROJECT_DIR $K8S_SECRET_CDASH script: - ctest -V -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-fast - ccache -s @@ -56,6 +49,13 @@ fast-build: extends: .general only: [merge_requests] stage: build + before_script: + # Provision efficiently the local LFS cache before checkout + - git lfs fetch origin $CI_COMMIT_SHA + # Checkout the expected branch + - git checkout -f -q $CI_COMMIT_SHA + after_script: + - python3 CI/cdash_handler.py $CI_COMMIT_SHA $CI_PROJECT_ID $CI_PROJECT_DIR $K8S_SECRET_CDASH debian-build: extends: .common-build @@ -79,12 +79,9 @@ ubuntu-llvm: only: [merge_requests] stage: prepare before_script: -# This override the previous before_script - export GIT_LFS_SKIP_SMUDGE=1 - git checkout -f -q $CI_COMMIT_SHA - export GIT_LFS_SKIP_SMUDGE=0 - after_script: - - echo "Nothing to do for after_script" artifacts: expire_in: 24 hrs paths: diff --git a/CI/main_superbuild.cmake b/CI/main_superbuild.cmake index a7ba0f96d7049eb6b10d4227acd33ff6d886f594..84d0b12377cab4e0286db259c96c43e05ec2f217 100644 --- a/CI/main_superbuild.cmake +++ b/CI/main_superbuild.cmake @@ -50,7 +50,7 @@ find_program(CTEST_GIT_COMMAND NAMES git git.cmd) # FIXME: Replace ${GIT} variable with $[CTEST_GIT_COMMAND}" set( GIT "${CTEST_GIT_COMMAND}" ) - +set( DEBUG 1 ) execute_process( COMMAND ${GIT} "clone" "${REMOTE}" "--branch" "${BRANCH_NAME}" "--depth" "1" "superbuild-artifact"