From a242c878c335648793126bb70dd3a6139e7477cf Mon Sep 17 00:00:00 2001
From: Meghan Denny <meghan@bun.sh>
Date: Tue, 15 Jul 2025 00:22:41 -0800
Subject: [PATCH] [publish images] ci: add ubuntu 25.04 (#20996)

Co-authored-by: Jarred Sumner <jarred@jarredsumner.com>
Co-authored-by: Jarred-Sumner <709451+Jarred-Sumner@users.noreply.github.com>
---
 .buildkite/ci.mjs       |  3 +++
 scripts/bootstrap.ps1   |  2 +-
 scripts/bootstrap.sh    | 14 +++++++++++++-
 scripts/runner.node.mjs | 11 ++++++-----
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/.buildkite/ci.mjs b/.buildkite/ci.mjs
index 971607eaa0..c9136c069d 100755
--- a/.buildkite/ci.mjs
+++ b/.buildkite/ci.mjs
@@ -127,8 +127,11 @@ const testPlatforms = [
   { os: "linux", arch: "x64", distro: "debian", release: "12", tier: "latest" },
   { os: "linux", arch: "x64", baseline: true, distro: "debian", release: "12", tier: "latest" },
   { os: "linux", arch: "x64", profile: "asan", distro: "debian", release: "12", tier: "latest" },
+  { os: "linux", arch: "aarch64", distro: "ubuntu", release: "25.04", tier: "latest" },
   { os: "linux", arch: "aarch64", distro: "ubuntu", release: "24.04", tier: "latest" },
+  { os: "linux", arch: "x64", distro: "ubuntu", release: "25.04", tier: "latest" },
   { os: "linux", arch: "x64", distro: "ubuntu", release: "24.04", tier: "latest" },
+  { os: "linux", arch: "x64", baseline: true, distro: "ubuntu", release: "25.04", tier: "latest" },
   { os: "linux", arch: "x64", baseline: true, distro: "ubuntu", release: "24.04", tier: "latest" },
   { os: "linux", arch: "aarch64", abi: "musl", distro: "alpine", release: "3.21", tier: "latest" },
   { os: "linux", arch: "x64", abi: "musl", distro: "alpine", release: "3.21", tier: "latest" },
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index b50ca4772b..0d4f8cbd2d 100755
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -1,4 +1,4 @@
-# Version: 9
+# Version: 10
 # A script that installs the dependencies needed to build and test Bun.
 # This should work on Windows 10 or newer with PowerShell.
 
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 50b3ddca20..44af154cc3 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Version: 15
+# Version: 16
 
 # A script that installs the dependencies needed to build and test Bun.
 # This should work on macOS and Linux with a POSIX shell.
@@ -1538,6 +1538,17 @@ clean_system() {
 	done
 }
 
+ensure_no_tmpfs() {
+	if ! [ "$os" = "linux" ]; then
+		return
+	fi
+	if ! [ "$distro" = "ubuntu" ]; then
+		return
+	fi
+
+	execute_sudo systemctl mask tmp.mount
+}
+
 main() {
 	check_features "$@"
 	check_operating_system
@@ -1555,6 +1566,7 @@ main() {
 		configure_core_dumps
 	fi
 	clean_system
+	ensure_no_tmpfs
 }
 
 main "$@"
diff --git a/scripts/runner.node.mjs b/scripts/runner.node.mjs
index d4c5545115..5d565bc861 100755
--- a/scripts/runner.node.mjs
+++ b/scripts/runner.node.mjs
@@ -20,6 +20,7 @@ import {
   readdirSync,
   readFileSync,
   realpathSync,
+  rmSync,
   statSync,
   symlinkSync,
   unlink,
@@ -978,11 +979,11 @@ async function spawnBun(execPath, { args, cwd, timeout, env, stdout, stderr }) {
       stderr,
     });
   } finally {
-    // try {
-    //   rmSync(tmpdirPath, { recursive: true, force: true });
-    // } catch (error) {
-    //   console.warn(error);
-    // }
+    try {
+      rmSync(tmpdirPath, { recursive: true, force: true });
+    } catch (error) {
+      console.warn(error);
+    }
   }
 }