Skip to content

Commit ce9506c

Browse files
authored
chore(ci): run macOS jobs in GitLab for MergeQueue. Remove broken label rule (#1833)
# What does this PR do? Now that we have dedicated MacOS runners (DataDog/libddprof-build#166) in GitLab, contention with the general pool is not an issue. We should be running the MacOS tests on the MergeQueue to prevent bad mac merges to main. Using the `run-macos-tests` label in Github to trigger the jobs in GitLab for PRs didn't (ever?) work. So just getting rid of it. Assuming things work out well with the dedicated runners we can consider upping the allocation of runners and just running macOS builds on all PRs. # Motivation What inspired you to submit this pull request? # Additional Notes Anything else we should know when reviewing? # How to test the change? Describe here in detail how the change can be validated. Co-authored-by: edmund.kump <edmund.kump@datadoghq.com>
1 parent cdf941e commit ce9506c

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ trigger_internal_build:
2828
when: always
2929
- if: '$CI_EXTERNAL_PULL_REQUEST_SOURCE_BRANCH_NAME =~ /^release\//'
3030
when: always
31-
- if: '$CI_MERGE_REQUEST_LABELS =~ /run-macos-tests/'
31+
- if: '$CI_COMMIT_BRANCH == "main"'
3232
variables:
3333
LIBDATADOG_ENABLE_MACOS_JOBS: "true"
3434
when: always
35-
- if: '$CI_COMMIT_BRANCH == "main"'
35+
- if: '$CI_COMMIT_BRANCH =~ /^mq-working-branch-/'
3636
variables:
3737
LIBDATADOG_ENABLE_MACOS_JOBS: "true"
3838
when: always

0 commit comments

Comments
 (0)