From aafd9acca9fe98bad1710a4af2f1b0eabadd6944 Mon Sep 17 00:00:00 2001 From: Jon Lockwood Date: Wed, 16 Feb 2022 12:13:31 +0930 Subject: [PATCH] ci(docker_hub): ensure build and DH push works on merge fix the merge request dockerhub build. var CI_COMMIT_BRANCH is not available in a merge request pipleine. adjusted the pipline to run if development branch with a commit message starting with Merge branch. this enables usage of variable CI_COMMIT_BRANCH. MR !4 --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b623e5a..2220899 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,7 +62,7 @@ Docker Container: rules: - if: $CI_COMMIT_TAG when: on_success - - if: '$CI_COMMIT_BRANCH == "development" && $CI_PIPELINE_SOURCE == "merge_request_event"' + - if: '$CI_COMMIT_BRANCH == "development" && $CI_COMMIT_TITLE =~ /Merge branch.*/' when: on_success - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' when: never @@ -128,7 +128,7 @@ Docker Hub: rules: - if: $CI_COMMIT_TAG when: on_success - - if: '$CI_COMMIT_BRANCH == "development" && $CI_PIPELINE_SOURCE == "merge_request_event"' + - if: '$CI_COMMIT_BRANCH == "development" && $CI_COMMIT_TITLE =~ /Merge branch.*/' when: on_success - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' when: never