diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3dfd23e..e02ebce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,8 @@ build:docker: interruptible: true stage: build rules: - - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' tags: [ docker ] before_script: - echo "COMMIT=${CI_COMMIT_SHA}" >> version.env # COMMIT=`git rev-parse HEAD` @@ -21,6 +22,7 @@ build:apt: stage: build rules: - if: $CI_COMMIT_BRANCH + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' before_script: - echo "COMMIT=${CI_COMMIT_SHA}" >> version.env - source version.env @@ -57,6 +59,7 @@ build:pacman: stage: build rules: - if: $CI_COMMIT_BRANCH + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' before_script: - echo "COMMIT=${CI_COMMIT_SHA}" >> version.env # install build dependencies