[.github] Update: use Github 'concurrency' definition instead of work…

…flow-run-cleanup-action
EskoDijk · Sep 24, 2024 · e5f0f74 · e5f0f74
1 parent b4023fc
commit e5f0f74
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 43 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -32,15 +32,11 @@ on:
     branches:
       - 'main'
 
-jobs:
-  cancel-previous-runs:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: rokroskar/workflow-run-cleanup-action@master
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-        if: "github.ref != 'refs/heads/main'"
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
+jobs:
   build:
     name: Build (Go ${{ matrix.go }}, ${{ matrix.os }})
     runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -32,17 +32,13 @@ on:
     branches:
       - 'develop'
 
-jobs:
-  cancel-previous-runs:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: rokroskar/workflow-run-cleanup-action@master
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-        if: "github.ref != 'refs/heads/main'"
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
+jobs:
   develop:
-    name: Develop (Go${{ matrix.go }},${{ matrix.os }})
+    name: Develop (Go${{ matrix.go }}, ${{ matrix.os }})
     runs-on: ${{ matrix.os }}
     env:
       HOMEBREW_NO_AUTO_UPDATE: 1

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -32,15 +32,11 @@ on:
     branches:
       - 'docker'
 
-jobs:
-  cancel-previous-runs:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: rokroskar/workflow-run-cleanup-action@master
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-        if: "github.ref != 'refs/heads/main'"
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
+jobs:
   buildx:
     name: buildx-${{ matrix.version }}
     runs-on: ubuntu-22.04

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2023, The OTNS Authors.
+# Copyright (c) 2020-2024, The OTNS Authors.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -32,17 +32,13 @@ on:
     branches:
       - 'main'
 
-jobs:
-  cancel-previous-runs:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: rokroskar/workflow-run-cleanup-action@master
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-        if: "github.ref != 'refs/heads/main'"
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
+jobs:
   go-lint:
-    name: Go Lint
+    name: Go/Shell Lint
     runs-on: ubuntu-22.04
     env:
       HOMEBREW_NO_AUTO_UPDATE: 1

diff --git a/.github/workflows/stress.yml b/.github/workflows/stress.yml
@@ -32,15 +32,11 @@ on:
     branches:
       - 'main'
 
-jobs:
-  cancel-previous-runs:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: rokroskar/workflow-run-cleanup-action@master
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-        if: "github.ref != 'refs/heads/main'"
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
+jobs:
   stress-tests:
     name: "Test Suite ${{ matrix.suite }}"
     strategy: