Merge branch 'master' into move-ic-branch-to-app

dfinity · Dec 17, 2024 · 679846c · 679846c
2 parents 3b4d626 + e0b516f
commit 679846c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/.github/workflows-source/ci-main.yml b/.github/workflows-source/ci-main.yml
@@ -180,11 +180,10 @@ jobs:
       labels: macOS
     # Run on protected branches, but only on public repo
     # Allow running if CI_MACOS_INTEL label is used
-    if: >
-      ${{
-        (github.ref_protected && github.repository == 'dfinity/ic') ||
-        (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'CI_MACOS_INTEL'))
-      }}
+    if: |
+      (github.ref_protected && github.repository == 'dfinity/ic') ||
+      (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'CI_MACOS_INTEL'))
+
     steps:
       - <<: *checkout
       - name: Set PATH

diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
@@ -171,14 +171,9 @@ jobs:
       labels: macOS
     # Run on protected branches, but only on public repo
     # Allow running if CI_MACOS_INTEL label is used
-    if: >
-      ${{
-
-
-        (github.ref_protected && github.repository == 'dfinity/ic') ||
-        (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'CI_MACOS_INTEL'))
-      }}
-
+    if: |
+      (github.ref_protected && github.repository == 'dfinity/ic') ||
+      (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'CI_MACOS_INTEL'))
     steps:
       - name: Checkout
         uses: actions/checkout@v4