Update runners again

wailsapp · Sep 18, 2024 · a61665e · a61665e
1 parent d6f94be
commit a61665e
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -12,15 +12,15 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [warp-ubuntu-latest-x64-2x, warp-ubuntu-2404-x64-2x, windows-11-large, warp-macos-14-arm64-6x]
+        os: [ubuntu-22.04, ubuntu-24.04, windows-11-large, macos-latest]
         go-version: ['1.22']
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
       - uses: awalsh128/cache-apt-pkgs-action@latest
-        if: matrix.os == 'warp-ubuntu-latest-x64-2x'
+        if: matrix.os == 'ubuntu-22.04'
         with:
           packages: libgtk-3-dev libwebkit2gtk-4.0-dev build-essential pkg-config
           version: 1.0
@@ -38,14 +38,14 @@ jobs:
           cache-dependency-path: ./v2/go.sum
 
       - name: Run tests (mac)
-        if: matrix.os == 'warp-macos-14-arm64-6x' || matrix.os == 'macos-11'
+        if: matrix.os == 'macos-latest'
         env:
           CGO_LDFLAGS: -framework UniformTypeIdentifiers -mmacosx-version-min=10.13
         working-directory: ./v2
         run: go test -v ./...
 
       - name: Run tests (!mac)
-        if: matrix.os != 'warp-macos-14-arm64-6x' && matrix.os != 'macos-11' && matrix.os != 'ubuntu-24.04'
+        if: matrix.os != 'macos-latest' && matrix.os != 'ubuntu-24.04'
         working-directory: ./v2
         run: go test -v ./...
 
@@ -67,10 +67,9 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-          cache: 'npm'
 
       - name: Install dependencies
         run: npm install
@@ -87,7 +86,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [warp-ubuntu-latest-x64-2x, windows-11-large, warp-macos-14-arm64-6x, ubuntu-24.04, macos-11]
+        os: [ubuntu-22.04, windows-11-large, macos-latest, ubuntu-24.04]
         template:
           [
             svelte,
@@ -122,7 +121,7 @@ jobs:
           wails -help
 
       - name: Install linux dependencies ( 22.04 )
-        if: matrix.os == 'warp-ubuntu-latest-x64-2x'
+        if: matrix.os == 'ubuntu-22.04'
         run: sudo apt-get update -y && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev build-essential pkg-config
 
       - name: Install linux dependencies ( 24.04 )