Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .buildkite/ci.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
Expand Down
4 changes: 2 additions & 2 deletions dockerhub/debian-slim/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions dockerhub/debian/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions dockerhub/distroless/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions scripts/bootstrap.sh
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion scripts/utils.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
});
Expand Down
8 changes: 4 additions & 4 deletions test/bundler/bun-build-compile-wasm.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -34,7 +34,7 @@ describe("Bun.build compile with wasm", () => {
process.exit(1);
}
}

main();
`,
// A real WebAssembly module that exports an 'add' function
Expand Down
1 change: 1 addition & 0 deletions test/no-validate-leaksan.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions test/preload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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] + "";
}

Expand Down