From 8ce7eae1a3084fad857968fca926818efe3fbb31 Mon Sep 17 00:00:00 2001
From: Ashcon Partovi <ashcon@partovi.net>
Date: Thu, 6 Jun 2024 14:22:04 -0700
Subject: [PATCH] Zig optimized machines

---
 .buildkite/pipeline.yml               | 24 ++++++++----------------
 .buildkite/scripts/bootstrap-linux.sh |  7 ++++---
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index e63146dc48..3a15f07433 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -23,8 +23,7 @@ steps:
       - key: "bun-darwin-aarch64-zig"
         label: ":darwin: aarch64 - bun-zig"
         agents:
-          os: "darwin"
-          arch: "aarch64"
+          zig: "true"
         artifact_paths:
           - "bun-zig.o"
         env:
@@ -100,8 +99,7 @@ steps:
       - key: "bun-darwin-x64-zig"
         label: ":darwin: x64 - bun-zig"
         agents:
-          os: "darwin"
-          arch: "aarch64"
+          zig: "true"
         artifact_paths:
           - "bun-zig.o"
         env:
@@ -177,8 +175,7 @@ steps:
       - key: "bun-darwin-x64-baseline-zig"
         label: ":darwin: x64-baseline - bun-zig"
         agents:
-          os: "darwin"
-          arch: "aarch64"
+          zig: "true"
         artifact_paths:
           - "bun-zig.o"
         env:
@@ -254,8 +251,7 @@ steps:
       - key: "bun-linux-aarch64-zig"
         label: ":linux: aarch64 - bun-zig"
         agents:
-          os: "linux"
-          arch: "x64"
+          zig: "true"
         artifact_paths:
           - "bun-zig.o"
         env:
@@ -331,8 +327,7 @@ steps:
       - key: "bun-linux-x64-zig"
         label: ":linux: x64 - bun-zig"
         agents:
-          os: "linux"
-          arch: "x64"
+          zig: "true"
         artifact_paths:
           - "bun-zig.o"
         env:
@@ -408,8 +403,7 @@ steps:
       - key: "bun-linux-x64-baseline-zig"
         label: ":linux: x64-baseline - bun-zig"
         agents:
-          os: "linux"
-          arch: "x64"
+          zig: "true"
         artifact_paths:
           - "bun-zig.o"
         env:
@@ -481,8 +475,7 @@ steps:
       - key: "bun-windows-x64-zig"
         label: ":windows: x64 - bun-zig"
         agents:
-          os: "darwin"
-          arch: "aarch64"
+          zig: "true"
         artifact_paths:
           - "bun-zig.o"
         env:
@@ -569,8 +562,7 @@ steps:
       - key: "bun-windows-x64-baseline-zig"
         label: ":windows: x64-baseline - bun-zig"
         agents:
-          os: "darwin"
-          arch: "aarch64"
+          zig: "true"
         artifact_paths:
           - "bun-zig.o"
         env:
diff --git a/.buildkite/scripts/bootstrap-linux.sh b/.buildkite/scripts/bootstrap-linux.sh
index 01bda83f56..05dc8d0dcf 100755
--- a/.buildkite/scripts/bootstrap-linux.sh
+++ b/.buildkite/scripts/bootstrap-linux.sh
@@ -22,6 +22,7 @@ LLVM_VERSION=16
 NODE_VERSION=22
 PNPM_VERSION=9
 BUN_VERSION=1.1.8
+DEBIAN_VERSION=$(lsb_release -cs)
 
 # Install dependencies
 apt-get update
@@ -33,8 +34,8 @@ apt-get install -y --reinstall --no-install-recommends \
   curl
 
 # Add repositories
-echo "deb https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-${LLVM_VERSION} main" > /etc/apt/sources.list.d/llvm.list
-echo "deb-src https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-${LLVM_VERSION} main" >> /etc/apt/sources.list.d/llvm.list
+echo "deb https://apt.llvm.org/${DEBIAN_VERSION}/ llvm-toolchain-${DEBIAN_VERSION}-${LLVM_VERSION} main" > /etc/apt/sources.list.d/llvm.list
+echo "deb-src https://apt.llvm.org/${DEBIAN_VERSION}/ llvm-toolchain-${DEBIAN_VERSION}-${LLVM_VERSION} main" >> /etc/apt/sources.list.d/llvm.list
 curl -fsSL "https://apt.llvm.org/llvm-snapshot.gpg.key" | apt-key add -
 echo "deb https://deb.nodesource.com/node_${NODE_VERSION}.x nodistro main" > /etc/apt/sources.list.d/nodesource.list
 curl -fsSL "https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key" | apt-key add -
@@ -44,7 +45,7 @@ install -m 0755 -d /etc/apt/keyrings
 curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc
 chmod a+r /etc/apt/keyrings/docker.asc
 echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \
-  $(. /etc/os-release && echo "bullseye") stable" | \
+  $(. /etc/os-release && echo "${DEBIAN_VERSION}") stable" | \
   tee /etc/apt/sources.list.d/docker.list > /dev/null
 curl -fsSL https://keys.openpgp.org/vks/v1/by-fingerprint/32A37959C2FA5C3C99EFBC32A79206696452D198 \
   | gpg --batch --yes --dearmor -o /usr/share/keyrings/buildkite-agent-archive-keyring.gpg