ci: update detection of workflow cancellation scenarios (#21342)

vlang · Apr 24, 2024 · 28cabf4 · 28cabf4
1 parent 8dafca1
commit 28cabf4
Show file tree

Hide file tree

Showing 25 changed files with 59 additions and 71 deletions.
diff --git a/.github/workflows/bootstrapping_works_ci.yml b/.github/workflows/bootstrapping_works_ci.yml
@@ -10,9 +10,12 @@ on:
     paths-ignore:
       - "**.md"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.sha || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   bootstrapping-works:
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     strategy:
       matrix:
         os: [ubuntu-latest, macos-14]

diff --git a/.github/workflows/c2v_ci.yml b/.github/workflows/c2v_ci.yml
@@ -19,12 +19,11 @@ on:
       - 'tutorials/**'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.sha || github.ref }}
   cancel-in-progress: true
 
 jobs:
   build-doom:
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     strategy:
       matrix:
         os: [ubuntu-20.04, macos-12]
@@ -59,7 +58,6 @@ jobs:
           WAD_FILE=~/DOOM1.WAD ~/code/doom/build_whole_project.sh
 
   test-regression:
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     runs-on: ubuntu-20.04
     timeout-minutes: 20
     env:

diff --git a/.github/workflows/cross_ci.yml b/.github/workflows/cross_ci.yml
@@ -12,11 +12,13 @@ on:
       - '**.yml'
       - '!**/cross_ci.yml'
 
-jobs:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.sha || github.ref }}
+  cancel-in-progress: true
 
+jobs:
   macos-cross:
     runs-on: macos-latest
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     timeout-minutes: 25
     env:
       VFLAGS: -cc clang
@@ -48,7 +50,6 @@ jobs:
 
   linux-cross:
     runs-on: ubuntu-20.04
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     timeout-minutes: 25
     env:
       VFLAGS: -cc tcc -no-retry-compilation
@@ -97,7 +98,6 @@ jobs:
 
   windows-cross:
     runs-on: windows-2019
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     timeout-minutes: 25
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/docker_alpine.yml b/.github/workflows/docker_alpine.yml
@@ -5,19 +5,20 @@ on:
     paths-ignore:
       - "**.md"
       - "**.yml"
+      - '!**/docker_alpine.yml'
   pull_request:
     paths-ignore:
       - "**.md"
       - "**.yml"
+      - '!**/docker_alpine.yml'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.sha || github.ref }}
   cancel-in-progress: true
 
 jobs:
   alpine-docker-musl-gcc:
     runs-on: ubuntu-20.04
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     timeout-minutes: 241
     container:
       image: thevlang/vlang:alpine-build

diff --git a/.github/workflows/docker_ubuntu.yml b/.github/workflows/docker_ubuntu.yml
@@ -5,19 +5,20 @@ on:
     paths-ignore:
       - "**.md"
       - "**.yml"
+      - "!**/docker_ubuntu.yml"
   pull_request:
     paths-ignore:
       - "**.md"
       - "**.yml"
+      - "!**/docker_ubuntu.yml"
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.sha || github.ref }}
   cancel-in-progress: true
 
 jobs:
   ubuntu-docker-musl:
     runs-on: ubuntu-20.04
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     timeout-minutes: 121
     container:
       image: thevlang/vlang:ubuntu-build

diff --git a/.github/workflows/docs_ci.yml b/.github/workflows/docs_ci.yml
@@ -8,14 +8,19 @@ on:
   push:
     paths-ignore:
       - "**.yml"
+      - "!**/docs_ci.yml"
   pull_request:
     paths-ignore:
       - "**.yml"
+      - "!**/docs_ci.yml"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.sha || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   check-markdown:
     runs-on: ubuntu-20.04
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     timeout-minutes: 5
     steps:
       - uses: actions/checkout@v4
@@ -28,7 +33,6 @@ jobs:
 
   report-missing-fn-doc:
     runs-on: ubuntu-20.04
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     timeout-minutes: 5
     env:
       MOPTIONS: --diff --deprecated --relative-paths --exclude /vlib/v/ --exclude /builtin/linux_bare/ --exclude /testdata/ --exclude /tests/

diff --git a/.github/workflows/gen_vc_ci.yml b/.github/workflows/gen_vc_ci.yml
@@ -19,13 +19,12 @@ on:
 # Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
 # However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
 concurrency:
-  group: ${{ github.workflow }}
-  cancel-in-progress: false
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ !contains(github.ref, 'master')}}
 
 jobs:
   build-vc:
     runs-on: ubuntu-latest
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     steps:
       - uses: actions/checkout@v4
       - name: Build V

diff --git a/.github/workflows/gg_regressions_ci.yml b/.github/workflows/gg_regressions_ci.yml
@@ -12,10 +12,13 @@ on:
       - '**.yml'
       - '!**/gg_regressions_ci.yml'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.sha || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   gg-regressions:
     runs-on: ubuntu-20.04
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     timeout-minutes: 20
     env:
       VFLAGS: -cc tcc

diff --git a/.github/workflows/linux_ci.yml b/.github/workflows/linux_ci.yml
@@ -13,13 +13,12 @@ on:
       - '!**/linux_ci.yml'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.sha || github.ref }}
   cancel-in-progress: true
 
 jobs:
   tcc:
     runs-on: ubuntu-20.04
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     timeout-minutes: 121
     env:
       VFLAGS: -cc tcc -no-retry-compilation
@@ -99,7 +98,6 @@ jobs:
 
   tcc-boehm-gc:
     runs-on: ubuntu-20.04
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     timeout-minutes: 121
     env:
       VFLAGS: -cc tcc -no-retry-compilation
@@ -156,7 +154,6 @@ jobs:
 
   gcc:
     runs-on: ubuntu-20.04
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     timeout-minutes: 121
     steps:
       - uses: actions/checkout@v4
@@ -262,7 +259,6 @@ jobs:
 
   clang:
     runs-on: ubuntu-20.04
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     timeout-minutes: 121
     env:
       VFLAGS: -cc clang

diff --git a/.github/workflows/macos_ci.yml b/.github/workflows/macos_ci.yml
@@ -13,13 +13,12 @@ on:
       - '!**/macos_ci.yml'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.sha || github.ref }}
   cancel-in-progress: true
 
 jobs:
   clang:
     runs-on: macOS-12
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     timeout-minutes: 121
     env:
       VFLAGS: -cc clang

diff --git a/.github/workflows/module_docs_ci.yml b/.github/workflows/module_docs_ci.yml
@@ -19,13 +19,12 @@ on:
 # Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
 # However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
 concurrency:
-  group: ${{ github.workflow }}
-  cancel-in-progress: false
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ !contains(github.ref, 'master')}}
 
 jobs:
   build-module-docs:
     runs-on: ubuntu-20.04
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     steps:
       - uses: actions/checkout@v4
       - name: Build V

diff --git a/.github/workflows/native_backend_tests_ci.yml b/.github/workflows/native_backend_tests_ci.yml
@@ -43,7 +43,7 @@ on:
       - 'vlib/v/gen/native/tests/**.v'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.sha || github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -56,7 +56,6 @@ jobs:
           windows-2019
         ]
     runs-on: ${{ matrix.os }}
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     steps:
       - uses: actions/checkout@v4
 

diff --git a/.github/workflows/other_ci.yml b/.github/workflows/other_ci.yml
@@ -13,13 +13,12 @@ on:
       - '!**/other_ci.yml'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.sha || github.ref }}
   cancel-in-progress: true
 
 jobs:
   no-gpl-by-accident:
     runs-on: ubuntu-20.04
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v4
@@ -29,7 +28,6 @@ jobs:
 
   code-formatting:
     runs-on: ubuntu-20.04
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     timeout-minutes: 30
     env:
       VFLAGS: -cc gcc
@@ -46,7 +44,6 @@ jobs:
 
   performance-regressions:
     runs-on: ubuntu-20.04
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     timeout-minutes: 30
     env:
       VFLAGS: -cc gcc
@@ -71,7 +68,6 @@ jobs:
 
   misc-tooling:
     runs-on: ubuntu-20.04
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     timeout-minutes: 121
     env:
       VFLAGS: -cc tcc -no-retry-compilation
@@ -111,7 +107,6 @@ jobs:
 
   parser-silent:
     runs-on: ubuntu-20.04
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     timeout-minutes: 121
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/paths_ci.yml b/.github/workflows/paths_ci.yml
@@ -4,19 +4,19 @@ on:
   push:
     paths-ignore:
       - "**.md"
+      - '!**/paths_ci.yml'
   pull_request:
     paths-ignore:
       - "**.md"
+      - '!**/paths_ci.yml'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.sha || github.ref }}
   cancel-in-progress: true
 
 jobs:
-
   space-paths-linux:
     runs-on: ubuntu-20.04
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     timeout-minutes: 30
     env:
       MY_V_PATH: '你好 my $path, @с интервали'
@@ -42,7 +42,6 @@ jobs:
 
   space-paths-macos:
     runs-on: macos-14
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     timeout-minutes: 30
     env:
       MY_V_PATH: '你好 my $path, @с интервали'
@@ -71,7 +70,6 @@ jobs:
 
   space-paths-windows:
     runs-on: windows-2022
-    if: github.event_name != 'push' || github.ref == 'refs/heads/master' || github.repository != 'vlang/v'
     timeout-minutes: 30
     env:
       MY_V_PATH: 'path with some $punctuation, and some spaces'