diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-03 18:08:43 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-03 18:08:43 +0000 |
| commit | 03717bbc9fa4112a0cbc48f613f416f2aa1c6cbb (patch) | |
| tree | a7b2d1c4175d725538e0b72e6f5aec33dc9b3d4d /.gitlab | |
| parent | 27a5080c34c64a84219d855d652b994c5e344a0a (diff) | |
| download | gitlab-ce-03717bbc9fa4112a0cbc48f613f416f2aa1c6cbb.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/package-and-test/main.gitlab-ci.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitlab/ci/package-and-test/main.gitlab-ci.yml b/.gitlab/ci/package-and-test/main.gitlab-ci.yml index d80b1b44a22..8db781ddff2 100644 --- a/.gitlab/ci/package-and-test/main.gitlab-ci.yml +++ b/.gitlab/ci/package-and-test/main.gitlab-ci.yml @@ -130,6 +130,7 @@ trigger-omnibus-env: echo "OMNIBUS_GITLAB_BUILD_ON_ALL_OS=${OMNIBUS_GITLAB_BUILD_ON_ALL_OS:-false}" >> $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 echo "Built environment file for omnibus build:" cat $BUILD_ENV artifacts: @@ -173,6 +174,7 @@ trigger-omnibus: ee: $EE trigger: project: gitlab-org/build/omnibus-gitlab-mirror + branch: $TRIGGER_BRANCH strategy: depend trigger-omnibus-ce: |