chore(ci): Use concurrency instead of third party action, main runs a…

…ll jobs
getsentry · Oct 21, 2024 · 99848d9 · 99848d9
1 parent 48d577d
commit 99848d9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 32 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -10,7 +10,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 env:
   SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
@@ -19,16 +19,6 @@ jobs:
   diff_check:
     uses: ./.github/workflows/skip-ci.yml
 
-  cancel-previous-workflow:
-    runs-on: ubuntu-latest
-    needs: [diff_check]
-    if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
-    steps:
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # pin@0.12.1
-        with:
-          access_token: ${{ github.token }}
-
   metrics:
     runs-on: ${{ matrix.runs-on }}
     needs: [diff_check]

diff --git a/.github/workflows/native-tests.yml b/.github/workflows/native-tests.yml
@@ -8,20 +8,14 @@ on:
       - release/**
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 jobs:
   diff_check:
     uses: ./.github/workflows/skip-ci.yml
 
-  cancel-previous-workflow:
-    runs-on: ubuntu-latest
-    needs: [diff_check]
-    if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
-    steps:
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # pin@0.12.1
-        with:
-          access_token: ${{ github.token }}
-
   test-ios:
     name: ios
     runs-on: macos-14 # uses m1 https://github.blog/changelog/2024-01-30-github-actions-macos-14-sonoma-is-now-available/

diff --git a/.github/workflows/sample-application.yml b/.github/workflows/sample-application.yml
@@ -9,7 +9,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 env:
   SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
@@ -19,16 +19,6 @@ jobs:
   diff_check:
     uses: ./.github/workflows/skip-ci.yml
 
-  cancel-previous-workflow:
-    runs-on: ubuntu-latest
-    needs: [diff_check]
-    if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
-    steps:
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # pin@0.12.1
-        with:
-          access_token: ${{ github.token }}
-
   build:
     name: Build ${{ matrix.rn-architecture }} ${{ matrix.platform }} ${{ matrix.build-type }} ${{ matrix.ios-use-frameworks}}
     runs-on: ${{ matrix.runs-on }}