Skip to content

Commit 7c1eacb

Browse files
committed
Merge branch 'ci/temp-disable-macos-test' into 'master'
ci: temp disable macos, only trigger by labels and run on master See merge request espressif/esp-idf!40064
2 parents 800a170 + d795ecf commit 7c1eacb

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

.gitlab/ci/dependencies/dependencies.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@
4343

4444
"build:macos":
4545
labels:
46-
- build
46+
# - build
4747
- macos
4848
- macos_test # for backward compatibility
49-
patterns:
50-
- build_system
51-
- build_macos
52-
- downloadable-tools
49+
# patterns:
50+
# - build_system
51+
# - build_macos
52+
# - downloadable-tools
5353

5454
# ---------------------------
5555
# Add patterns to build rules

.gitlab/ci/rules.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -360,15 +360,8 @@
360360
- <<: *if-revert-branch
361361
when: never
362362
- <<: *if-protected-check
363-
- <<: *if-label-build
364363
- <<: *if-label-macos
365364
- <<: *if-label-macos_test
366-
- <<: *if-dev-push
367-
changes: *patterns-build_macos
368-
- <<: *if-dev-push
369-
changes: *patterns-build_system
370-
- <<: *if-dev-push
371-
changes: *patterns-downloadable-tools
372365

373366
.rules:build:target_test:
374367
rules:

0 commit comments

Comments
 (0)