Add concurrency to workflows, enable cancel-in-progress

6 files changed, 25 insertions, 59 deletions

diff --git a/.github/workflows/bun-linux-aarch64.yml b/.github/workflows/bun-linux-aarch64.yml
index 24ffa793c..39bfbc413 100644
--- a/.github/workflows/bun-linux-aarch64.yml
+++ b/.github/workflows/bun-linux-aarch64.yml
@@ -1,4 +1,9 @@
 name: bun-linux
+
+concurrency:
+  group: bun-linux-aarch64-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
diff --git a/.github/workflows/bun-linux-build.yml b/.github/workflows/bun-linux-build.yml
index 9364f2f5e..8ecbfadbb 100644
--- a/.github/workflows/bun-linux-build.yml
+++ b/.github/workflows/bun-linux-build.yml
@@ -1,4 +1,9 @@
 name: bun-linux
+
+concurrency:
+  group: bun-linux-build-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
diff --git a/.github/workflows/bun-mac-aarch64.yml b/.github/workflows/bun-mac-aarch64.yml
index 64e885a1f..b4c148916 100644
--- a/.github/workflows/bun-mac-aarch64.yml
+++ b/.github/workflows/bun-mac-aarch64.yml
@@ -1,4 +1,9 @@
 name: bun-macOS-aarch64
+
+concurrency:
+  group: bun-macOS-aarch64-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
diff --git a/.github/workflows/bun-mac-x64-baseline.yml b/.github/workflows/bun-mac-x64-baseline.yml
index d80455bb8..15eba873d 100644
--- a/.github/workflows/bun-mac-x64-baseline.yml
+++ b/.github/workflows/bun-mac-x64-baseline.yml
@@ -1,4 +1,9 @@
 name: bun-macOS-x64-baseline
+
+concurrency:
+  group: bun-macOS-x64-baseline-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
diff --git a/.github/workflows/bun-mac-x64.yml b/.github/workflows/bun-mac-x64.yml
index 9218e5c0b..c9fe19ec3 100644
--- a/.github/workflows/bun-mac-x64.yml
+++ b/.github/workflows/bun-mac-x64.yml
@@ -1,4 +1,9 @@
 name: bun-macOS-x64
+
+concurrency:
+  group: bun-macOS-x64-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
diff --git a/.github/workflows/bun-test.yml b/.github/workflows/bun-test.yml
deleted file mode 100644
index af5b4bcc3..000000000
--- a/.github/workflows/bun-test.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-name: Test
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: "The version of Bun to run"
-        required: true
-        default: "canary"
-        type: string
-      path:
-        description: "The path to the test files"
-        required: true
-        default: "test/"
-        type: string
-      timeout:
-        description: "The timeout per file in milliseconds"
-        required: true
-        default: "15000"
-        type: number
-jobs:
-  test:
-    name: ${{ matrix.tag }}
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 10
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            tag: linux-x64
-            url: linux/x64?avx2=true
-          - os: ubuntu-latest
-            tag: linux-x64-baseline
-            url: linux/x64?baseline=true
-          # FIXME: runner fails with "No tests found"?
-          #- os: macos-latest
-          #  tag: darwin-x64
-          #  url: darwin/x64?avx2=true
-          - os: macos-latest
-            tag: darwin-x64-baseline
-            url: darwin/x64?baseline=true
-    steps:
-      - id: checkout
-        name: Checkout
-        uses: actions/checkout@v3
-        with:
-          submodules: false
-      - id: setup
-        name: Setup
-        uses: oven-sh/setup-bun@v1
-        with:
-          bun-download-url: https://bun.sh/download/${{ github.event.inputs.version }}/${{ matrix.url }}
-      - id: test
-        name: Test
-        run: |
-          bun install
-          bun install --cwd test
-          bun x ts-node --esm .github/scripts/test-runner.ts ${{ github.event.inputs.path }} --isolated --timeout=${{ github.event.inputs.timeout }}