diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-05 19:02:34 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-05 19:02:34 +0000 |
| commit | eb4a3b6ed231e0bda2ae746c895073148a03b1ba (patch) | |
| tree | 54377517ac8697badc446e656ca82354b39eeefd | |
| parent | 4417a14083e0a4d95370406e4450cc13fa244c1e (diff) | |
| download | gitlab-ce-eb4a3b6ed231e0bda2ae746c895073148a03b1ba.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-9-stable-ee
| -rw-r--r-- | .gitlab/ci/package-and-test/main.gitlab-ci.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab/ci/package-and-test/main.gitlab-ci.yml b/.gitlab/ci/package-and-test/main.gitlab-ci.yml index 2faea46e7d3..b1c04ba8a1c 100644 --- a/.gitlab/ci/package-and-test/main.gitlab-ci.yml +++ b/.gitlab/ci/package-and-test/main.gitlab-ci.yml @@ -125,7 +125,8 @@ trigger-omnibus-env: echo "OMNIBUS_GITLAB_CACHE_EDITION=${OMNIBUS_GITLAB_CACHE_EDITION:-GITLAB}" >> $BUILD_ENV echo "GITLAB_ASSETS_TAG=$(assets_image_tag)" >> $BUILD_ENV echo "EE=$([[ $FOSS_ONLY == '1' ]] && echo 'false' || echo 'true')" >> $BUILD_ENV - echo "TRIGGER_BRANCH=$([[ "$CI_COMMIT_REF_NAME" =~ ^[0-9-]+-stable(-ee)?$ ]] && echo ${CI_COMMIT_REF_NAME%-ee} || echo 'master')" >> $BUILD_ENV + target_branch_name="${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_COMMIT_REF_NAME}}" + echo "TRIGGER_BRANCH=$([[ "${target_branch_name}" =~ ^[0-9-]+-stable(-ee)?$ ]] && echo ${target_branch_name%-ee} || echo 'master')" >> $BUILD_ENV echo "Built environment file for omnibus build:" cat $BUILD_ENV artifacts: |