From 5bdb8ec0cb62b1a5b90682ffe729c546bccfcada Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Fri, 28 Nov 2025 15:01:40 -0800 Subject: [PATCH] all: update to debian 13 (#24055) [publish images] --- .buildkite/ci.mjs | 8 ++++---- dockerhub/debian-slim/Dockerfile | 4 ++-- dockerhub/debian/Dockerfile | 4 ++-- dockerhub/distroless/Dockerfile | 4 ++-- package.json | 2 +- scripts/bootstrap.sh | 4 ++-- scripts/utils.mjs | 2 +- test/bundler/bun-build-compile-wasm.test.ts | 8 ++++---- test/no-validate-leaksan.txt | 1 + test/preload.ts | 4 +--- 10 files changed, 20 insertions(+), 21 deletions(-) diff --git a/.buildkite/ci.mjs b/.buildkite/ci.mjs index da7c3213d1..1f9168bbe8 100755 --- a/.buildkite/ci.mjs +++ b/.buildkite/ci.mjs @@ -125,10 +125,10 @@ const testPlatforms = [ { os: "darwin", arch: "aarch64", release: "13", tier: "previous" }, { os: "darwin", arch: "x64", release: "14", tier: "latest" }, { os: "darwin", arch: "x64", release: "13", tier: "previous" }, - { os: "linux", arch: "aarch64", distro: "debian", release: "12", tier: "latest" }, - { 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: "debian", release: "13", tier: "latest" }, + { os: "linux", arch: "x64", distro: "debian", release: "13", tier: "latest" }, + { os: "linux", arch: "x64", baseline: true, distro: "debian", release: "13", tier: "latest" }, + { os: "linux", arch: "x64", profile: "asan", distro: "debian", release: "13", 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" }, diff --git a/dockerhub/debian-slim/Dockerfile b/dockerhub/debian-slim/Dockerfile index 755a8415ca..996034f9ca 100644 --- a/dockerhub/debian-slim/Dockerfile +++ b/dockerhub/debian-slim/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim AS build +FROM debian:trixie-slim AS build # https://github.com/oven-sh/bun/releases ARG BUN_VERSION=latest @@ -55,7 +55,7 @@ RUN apt-get update -qq \ && which bun \ && bun --version -FROM debian:bookworm-slim +FROM debian:trixie-slim # Disable the runtime transpiler cache by default inside Docker containers. # On ephemeral containers, the cache is not useful diff --git a/dockerhub/debian/Dockerfile b/dockerhub/debian/Dockerfile index f8ed38c3c5..85a9250d9a 100644 --- a/dockerhub/debian/Dockerfile +++ b/dockerhub/debian/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim AS build +FROM debian:trixie-slim AS build # https://github.com/oven-sh/bun/releases ARG BUN_VERSION=latest @@ -56,7 +56,7 @@ RUN apt-get update -qq \ && rm -f "bun-linux-$build.zip" SHASUMS256.txt.asc SHASUMS256.txt \ && chmod +x /usr/local/bin/bun -FROM debian:bookworm +FROM debian:trixie COPY docker-entrypoint.sh /usr/local/bin COPY --from=build /usr/local/bin/bun /usr/local/bin/bun diff --git a/dockerhub/distroless/Dockerfile b/dockerhub/distroless/Dockerfile index 32c8a0f99a..cb5f9a7292 100644 --- a/dockerhub/distroless/Dockerfile +++ b/dockerhub/distroless/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim AS build +FROM debian:trixie-slim AS build # https://github.com/oven-sh/bun/releases ARG BUN_VERSION=latest @@ -55,7 +55,7 @@ RUN apt-get update -qq \ && which bun \ && bun --version -FROM gcr.io/distroless/base-nossl-debian11 +FROM gcr.io/distroless/base-nossl-debian13 # Disable the runtime transpiler cache by default inside Docker containers. # On ephemeral containers, the cache is not useful diff --git a/package.json b/package.json index a8caf066ad..6a2a33497b 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "node:test:cp": "bun ./scripts/fetch-node-test.ts ", "clean:zig": "rm -rf build/debug/cache/zig build/debug/CMakeCache.txt 'build/debug/*.o' .zig-cache zig-out || true", "machine:linux:ubuntu": "./scripts/machine.mjs ssh --cloud=aws --arch=x64 --instance-type c7i.2xlarge --os=linux --distro=ubuntu --release=25.04", - "machine:linux:debian": "./scripts/machine.mjs ssh --cloud=aws --arch=x64 --instance-type c7i.2xlarge --os=linux --distro=debian --release=12", + "machine:linux:debian": "./scripts/machine.mjs ssh --cloud=aws --arch=x64 --instance-type c7i.2xlarge --os=linux --distro=debian --release=13", "machine:linux:alpine": "./scripts/machine.mjs ssh --cloud=aws --arch=x64 --instance-type c7i.2xlarge --os=linux --distro=alpine --release=3.22", "machine:linux:amazonlinux": "./scripts/machine.mjs ssh --cloud=aws --arch=x64 --instance-type c7i.2xlarge --os=linux --distro=amazonlinux --release=2023", "machine:windows:2019": "./scripts/machine.mjs ssh --cloud=aws --arch=x64 --instance-type c7i.2xlarge --os=windows --release=2019", diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 23aa93169f..20b39a1914 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Version: 20 +# Version: 21 # A script that installs the dependencies needed to build and test Bun. # This should work on macOS and Linux with a POSIX shell. @@ -1766,7 +1766,7 @@ ensure_no_tmpfs() { if ! [ "$os" = "linux" ]; then return fi - if ! [ "$distro" = "ubuntu" ]; then + if ! ( [ "$distro" = "ubuntu" ] || [ "$distro" = "debian" ] ); then return fi diff --git a/scripts/utils.mjs b/scripts/utils.mjs index b2cec8d209..4adedf30bf 100755 --- a/scripts/utils.mjs +++ b/scripts/utils.mjs @@ -2842,7 +2842,7 @@ export function printEnvironment() { if (isCI) { startGroup("Environment", () => { - for (const [key, value] of Object.entries(process.env)) { + for (const [key, value] of Object.entries(process.env).toSorted()) { console.log(`${key}:`, value); } }); diff --git a/test/bundler/bun-build-compile-wasm.test.ts b/test/bundler/bun-build-compile-wasm.test.ts index 5127f22493..9708be2dab 100644 --- a/test/bundler/bun-build-compile-wasm.test.ts +++ b/test/bundler/bun-build-compile-wasm.test.ts @@ -11,17 +11,17 @@ describe("Bun.build compile with wasm", () => { "app.js": ` // Import a wasm module and properly instantiate it import wasmPath from "./test.wasm"; - + async function main() { try { // Read the wasm file as ArrayBuffer const wasmBuffer = await Bun.file(wasmPath).arrayBuffer(); const { instance } = await WebAssembly.instantiate(wasmBuffer); - + // Call the add function from wasm const result = instance.exports.add(2, 3); console.log("WASM result:", result); - + if (result === 5) { console.log("WASM module loaded successfully"); process.exit(0); @@ -34,7 +34,7 @@ describe("Bun.build compile with wasm", () => { process.exit(1); } } - + main(); `, // A real WebAssembly module that exports an 'add' function diff --git a/test/no-validate-leaksan.txt b/test/no-validate-leaksan.txt index aaca0b2f5d..f9a50eed84 100644 --- a/test/no-validate-leaksan.txt +++ b/test/no-validate-leaksan.txt @@ -193,6 +193,7 @@ test/regression/issue/02499/02499.test.ts test/js/node/test/parallel/test-http-server-stale-close.js test/js/third_party/comlink/comlink.test.ts test/regression/issue/22635/22635.test.ts +test/js/node/test/parallel/test-http-url.parse-https.request.js # Bun::JSNodeHTTPServerSocket::clearSocketData diff --git a/test/preload.ts b/test/preload.ts index 35322932e1..ec495d7931 100644 --- a/test/preload.ts +++ b/test/preload.ts @@ -10,9 +10,7 @@ for (let key in process.env) { for (let key in harness.bunEnv) { if (key === "TZ") continue; - if (harness.bunEnv[key] === undefined) { - continue; - } + if (harness.bunEnv[key] === undefined) continue; process.env[key] = harness.bunEnv[key] + ""; }