cancel redundant CI jobs

openziti · May 18, 2023 · 9e0eaf6 · 9e0eaf6
1 parent 295843d
commit 9e0eaf6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
@@ -37,7 +37,7 @@ runs:
       name: Configure CMake
       with:
         configurePreset: ci-${{ inputs.preset }}
-        configurePresetAdditionalArgs: "[ `-B`, `./build`, ${{ inputs.cmake_opts }} ]"
+        configurePresetAdditionalArgs: "[ `-B`, `./build` ]"
 
     - name: build ziti-edge-tunnel
       shell: bash

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -4,8 +4,16 @@ on:
   push:
     branches: [ '**' ]
 
+  pull_request:
+    branches: [ main ]
+
   workflow_call:
 
+# cancel older, redundant runs of same workflow on same branch
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ${{ matrix.os }}
@@ -34,17 +42,17 @@ jobs:
             preset: windows-arm64
 
           - os: ubuntu-20.04
-            container: openziti/ziti-cmake:kentest
+            container: openziti/ziti-cmake
             name: Linux x86_64
             preset: linux-x64
 
           - os: ubuntu-20.04
-            container: openziti/ziti-cmake:kentest
+            container: openziti/ziti-cmake
             name: Linux arm
             preset: linux-arm
 
           - os: ubuntu-20.04
-            container: openziti/ziti-cmake:kentest
+            container: openziti/ziti-cmake
             name: Linux arm64
             preset: linux-arm64