From b5f8f0da0e678696e335f8ff47f7e3d5849a17ae Mon Sep 17 00:00:00 2001
From: deathaxe <deathaxe82@gmail.com>
Date: Thu, 28 May 2026 22:56:01 +0200
Subject: [PATCH] CI: update workflow

---
 .github/workflows/merge.yaml |  4 ++--
 .github/workflows/test.yaml  | 24 +++++++++---------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml
index 052422f8..bd5c9847 100644
--- a/.github/workflows/merge.yaml
+++ b/.github/workflows/merge.yaml
@@ -11,8 +11,8 @@ jobs:
       contents: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
-      - uses: actions/github-script@v7
+      - uses: actions/checkout@v6
+      - uses: actions/github-script@v9
         with:
           script: |
             await github.rest.repos.merge({
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index bfc4b4ef..473fbce2 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -12,16 +12,13 @@ on:
       - master
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+
 jobs:
-  cancel-previous-runs:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: styfle/cancel-workflow-action@0.12.1
-        with:
-          access_token: ${{ github.token }}
 
   test-both-actions-and-package:
-    needs: cancel-previous-runs
     strategy:
       fail-fast: false
       matrix:
@@ -29,7 +26,7 @@ jobs:
         os: ["ubuntu-latest", "macOS-latest", "windows-latest"]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: "./actions/setup"
         with:
           sublime-text-version: ${{ matrix.st-version }}
@@ -41,44 +38,41 @@ jobs:
           token: ${{secrets.CODECOV_TOKEN}}
 
   test-actions:  # with latest released unittesting
-    needs: cancel-previous-runs
     strategy:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest", "macOS-latest", "windows-latest"]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: "./actions/setup"
         with:
           install-package: false
       - uses: "./actions/run-tests"
 
   test-package:  # with v1 actions
-    needs: cancel-previous-runs
     strategy:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest", "macOS-latest", "windows-latest"]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: SublimeText/UnitTesting/actions/setup@v1
       - uses: SublimeText/UnitTesting/actions/run-tests@v1
 
   test-as-extra-package:
-    needs: cancel-previous-runs
     strategy:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest", "windows-latest"]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           repository: randy3k/UnitTesting-example
           path: UnitTesting-example
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           path: UnitTesting
       - uses: "./UnitTesting/actions/setup"