CI: try GitHub's Large runnersbuildjet-vs-github

Signed-off-by: Denton Gentry <dgentry@tailscale.com>

14 files changed, 16 insertions, 21 deletions

diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
index 2fb9db43c..d395cb8bf 100644
--- a/.github/workflows/cifuzz.yml
+++ b/.github/workflows/cifuzz.yml
@@ -9,7 +9,7 @@ concurrency:
 
 jobs:
   Fuzzing:
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: github-4vcpu-ubuntu-2204
     steps:
     - name: Build Fuzzers
       id: build
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index c02a8b5f6..bcf0ef2ec 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -27,7 +27,7 @@ concurrency:
 jobs:
   analyze:
     name: Analyze
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: github-4vcpu-ubuntu-2204
     permissions:
       actions: read
       contents: read
diff --git a/.github/workflows/cross-android.yml b/.github/workflows/cross-android.yml
index 163b984d3..d2aedc7d2 100644
--- a/.github/workflows/cross-android.yml
+++ b/.github/workflows/cross-android.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: github-4vcpu-ubuntu-2204
 
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
 
diff --git a/.github/workflows/cross-darwin.yml b/.github/workflows/cross-darwin.yml
index e6cc2b7c6..db5a7f6bf 100644
--- a/.github/workflows/cross-darwin.yml
+++ b/.github/workflows/cross-darwin.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: github-4vcpu-ubuntu-2204
 
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
 
diff --git a/.github/workflows/cross-freebsd.yml b/.github/workflows/cross-freebsd.yml
index 0a7b2be7f..71fe54ead 100644
--- a/.github/workflows/cross-freebsd.yml
+++ b/.github/workflows/cross-freebsd.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: github-4vcpu-ubuntu-2204
 
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
 
diff --git a/.github/workflows/cross-openbsd.yml b/.github/workflows/cross-openbsd.yml
index a65110450..1e87eb8f5 100644
--- a/.github/workflows/cross-openbsd.yml
+++ b/.github/workflows/cross-openbsd.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: github-4vcpu-ubuntu-2204
 
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
 
diff --git a/.github/workflows/cross-wasm.yml b/.github/workflows/cross-wasm.yml
index 93f82e9f7..5b0c39e6b 100644
--- a/.github/workflows/cross-wasm.yml
+++ b/.github/workflows/cross-wasm.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: github-4vcpu-ubuntu-2204
 
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
 
diff --git a/.github/workflows/cross-windows.yml b/.github/workflows/cross-windows.yml
index 8950e79e0..28bcb1dfe 100644
--- a/.github/workflows/cross-windows.yml
+++ b/.github/workflows/cross-windows.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: github-4vcpu-ubuntu-2204
 
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
 
diff --git a/.github/workflows/linux-race.yml b/.github/workflows/linux-race.yml
index 70812b885..2a46e96d2 100644
--- a/.github/workflows/linux-race.yml
+++ b/.github/workflows/linux-race.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: github-4vcpu-ubuntu-2204
 
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
 
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index be1945e51..b69f12587 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: github-4vcpu-ubuntu-2204
 
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
 
diff --git a/.github/workflows/linux32.yml b/.github/workflows/linux32.yml
index 1cea03e15..b14ceaad2 100644
--- a/.github/workflows/linux32.yml
+++ b/.github/workflows/linux32.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: github-4vcpu-ubuntu-2204
 
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
 
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 8b06be804..807654bc3 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -40,7 +40,7 @@ jobs:
       if: failure() && github.event_name == 'push'
 
   vet:
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: github-4vcpu-ubuntu-2204
     steps:
     - name: Set up Go
       uses: actions/setup-go@v3
@@ -66,7 +66,7 @@ jobs:
       if: failure() && github.event_name == 'push'
 
   staticcheck:
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: github-4vcpu-ubuntu-2204
     strategy:
       matrix:
         goos: [linux, windows, darwin]
diff --git a/.github/workflows/vm.yml b/.github/workflows/vm.yml
index 9f56bec9d..53989bc9e 100644
--- a/.github/workflows/vm.yml
+++ b/.github/workflows/vm.yml
@@ -11,7 +11,7 @@ concurrency:
 
 jobs:
   ubuntu2004-LTS-cloud-base:
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: [ self-hosted, linux, vm ]
 
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
 
@@ -27,17 +27,12 @@ jobs:
         with:
           go-version-file: go.mod
 
-      - name: Get QEMU
-        run: |
-          sudo apt-get -y update
-          sudo apt-get -y install qemu-system-x86 qemu-user genisoimage qemu-utils
-
       - name: Run VM tests
         run: go test ./tstest/integration/vms -v -no-s3 -run-vm-tests -run=TestRunUbuntu2004
         env:
           HOME: "/tmp"
           TMPDIR: "/tmp"
-          XDG_CACHE_HOME: "/home/runner/cache"
+          XDG_CACHE_HOME: "/var/lib/ghrunner/cache"
 
       - uses: k0kubun/action-slack@v2.0.0
         with:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 2b319ccc1..e78824ab4 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   test:
-    runs-on: [ self-hosted, Windows ]
+    runs-on: windows-8vcpu
 
     if: "!contains(github.event.head_commit.message, '[ci skip]')"