diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-08 17:01:48 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-08 17:01:48 +0000 |
| commit | 91683dcaa048bde2216c88fde4f49c7ec0e9e373 (patch) | |
| tree | 601a60337270cea4c5bdcb3e08f842cece0973c7 | |
| parent | a923b82a7e92a7c8916756b890d2e2eb3a64d309 (diff) | |
| download | gitlab-ce-91683dcaa048bde2216c88fde4f49c7ec0e9e373.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-10-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 d5446fda3ac..c830f541c90 100644 --- a/.gitlab/ci/package-and-test/main.gitlab-ci.yml +++ b/.gitlab/ci/package-and-test/main.gitlab-ci.yml @@ -128,7 +128,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: |