ci/cl: fix to run cancel previous build only on pull request branchs

opentibiabr · Dec 28, 2023 · 71bea88 · 71bea88
1 parent 4054751
commit 71bea88
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 13 deletions.
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -16,7 +16,7 @@ on:
 
 jobs:
   cancel-runs:
-    if: github.event_name == 'pull_request'
+    if: github.event_name == 'pull_request' && github.ref != 'refs/heads/main'
     runs-on: ubuntu-latest
     steps:
       - name: Cancel Previous Runs
@@ -90,13 +90,6 @@ jobs:
     if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }}
     runs-on: ubuntu-latest
     steps:
-      - name: Cancel Previous Runs
-        if: github.ref != 'refs/heads/main'
-        uses: fkirc/skip-duplicate-actions@master
-        with:
-          concurrent_skipping: "same_content"
-          cancel_others: true
-
       - name: Checkout
         uses: actions/checkout@main
         with:

diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
@@ -20,7 +20,7 @@ env:
 
 jobs:
   cancel-runs:
-    if: github.event_name == 'pull_request'
+    if: github.event_name == 'pull_request' && github.ref != 'refs/heads/main'
     runs-on: ubuntu-latest
     steps:
       - name: Cancel Previous Runs

diff --git a/.github/workflows/build-windows-cmake.yml b/.github/workflows/build-windows-cmake.yml
@@ -17,7 +17,7 @@ env:
   MAKEFLAGS: "-j 2"
 jobs:
   cancel-runs:
-    if: github.event_name == 'pull_request'
+    if: github.event_name == 'pull_request' && github.ref != 'refs/heads/main'
     runs-on: ubuntu-latest
     steps:
       - name: Cancel Previous Runs

diff --git a/.github/workflows/build-windows-solution.yml b/.github/workflows/build-windows-solution.yml
@@ -20,7 +20,7 @@ env:
 
 jobs:
   cancel-runs:
-    if: github.event_name == 'pull_request'
+    if: github.event_name == 'pull_request' && github.ref != 'refs/heads/main'
     runs-on: ubuntu-latest
     steps:
       - name: Cancel Previous Runs

diff --git a/.github/workflows/clang-lint.yml b/.github/workflows/clang-lint.yml
@@ -10,7 +10,7 @@ on:
       - "src/**"
 jobs:
   cancel-runs:
-    if: github.event_name == 'pull_request'
+    if: github.event_name == 'pull_request' && github.ref != 'refs/heads/main'
     runs-on: ubuntu-latest
     steps:
       - name: Cancel Previous Runs

diff --git a/.github/workflows/cron-stale.yml b/.github/workflows/cron-stale.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   cancel-runs:
-    if: github.event_name == 'pull_request'
+    if: github.event_name == 'pull_request' && github.ref != 'refs/heads/main'
     runs-on: ubuntu-latest
     steps:
       - name: Cancel Previous Runs