commit c8edfbe1d580fe3bfa0f95d0ec3a930cedce8711 (tree)
parent fd3657bf8c3a2861e1b35cf36d469d342d853880
Author: Alex Rønne Petersen <alex@alexrp.com>
Date: Thu, 22 Jan 2026 13:38:05 +0100
Merge pull request 'enable `x86_64-netbsd` CI' (#30889) from alexrp/zig:netbsd-ci into master
Reviewed-on: https://codeberg.org/ziglang/zig/pulls/30889
Diffstat:
23 files changed, 173 insertions(+), 0 deletions(-)
diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml
@@ -197,6 +197,27 @@ jobs:
run: sh ci/x86_64-linux-release.sh
timeout-minutes: 360
+ x86_64-netbsd-debug:
+ runs-on: [self-hosted, x86_64-netbsd]
+ steps:
+ - name: Checkout
+ uses: https://codeberg.org/ziglang/checkout@19af6bac491e2534a4687a50ee84fa7f13258d28
+ with:
+ fetch-depth: 0
+ - name: Build and Test
+ run: sh ci/x86_64-netbsd-debug.sh
+ timeout-minutes: 120
+ x86_64-netbsd-release:
+ runs-on: [self-hosted, x86_64-netbsd]
+ steps:
+ - name: Checkout
+ uses: https://codeberg.org/ziglang/checkout@19af6bac491e2534a4687a50ee84fa7f13258d28
+ with:
+ fetch-depth: 0
+ - name: Build and Test
+ run: sh ci/x86_64-netbsd-release.sh
+ timeout-minutes: 120
+
x86_64-openbsd-debug:
runs-on: [self-hosted, x86_64-openbsd]
steps:
diff --git a/ci/aarch64-linux-debug.sh b/ci/aarch64-linux-debug.sh
@@ -47,6 +47,7 @@ stage3-debug/bin/zig build test docs \
--maxrss ${ZSF_MAX_RSS:-0} \
-Dstatic-llvm \
-Dskip-non-native \
+ -Dskip-test-incremental \
-Dtarget=native-native-musl \
--search-prefix "$PREFIX" \
--zig-lib-dir "$PWD/../lib" \
diff --git a/ci/aarch64-linux-release.sh b/ci/aarch64-linux-release.sh
@@ -47,6 +47,7 @@ stage3-release/bin/zig build test docs \
--maxrss ${ZSF_MAX_RSS:-0} \
-Dstatic-llvm \
-Dskip-non-native \
+ -Dskip-test-incremental \
-Dtarget=native-native-musl \
--search-prefix "$PREFIX" \
--zig-lib-dir "$PWD/../lib" \
diff --git a/ci/aarch64-macos-debug.sh b/ci/aarch64-macos-debug.sh
@@ -47,6 +47,7 @@ stage3-debug/bin/zig build test docs \
-Denable-macos-sdk \
-Dstatic-llvm \
-Dskip-non-native \
+ -Dskip-test-incremental \
--search-prefix "$PREFIX" \
--test-timeout 2m
diff --git a/ci/aarch64-macos-release.sh b/ci/aarch64-macos-release.sh
@@ -46,6 +46,7 @@ stage3-release/bin/zig build test docs \
-Denable-macos-sdk \
-Dstatic-llvm \
-Dskip-non-native \
+ -Dskip-test-incremental \
--search-prefix "$PREFIX" \
--test-timeout 2m
diff --git a/ci/aarch64-windows.ps1 b/ci/aarch64-windows.ps1
@@ -60,6 +60,7 @@ Write-Output "Main test suite..."
--search-prefix "$PREFIX_PATH" `
-Dstatic-llvm `
-Dskip-non-native `
+ -Dskip-test-incremental `
-Denable-symlinks-windows `
--test-timeout 30m
CheckLastExitCode
diff --git a/ci/loongarch64-linux-debug.sh b/ci/loongarch64-linux-debug.sh
@@ -48,6 +48,7 @@ stage3-debug/bin/zig build test docs \
--maxrss ${ZSF_MAX_RSS:-0} \
-Dstatic-llvm \
-Dskip-non-native \
+ -Dskip-test-incremental \
-Dtarget=native-native-musl \
--search-prefix "$PREFIX" \
--zig-lib-dir "$PWD/../lib" \
diff --git a/ci/loongarch64-linux-release.sh b/ci/loongarch64-linux-release.sh
@@ -48,6 +48,7 @@ stage3-release/bin/zig build test docs \
--maxrss ${ZSF_MAX_RSS:-0} \
-Dstatic-llvm \
-Dskip-non-native \
+ -Dskip-test-incremental \
-Dtarget=native-native-musl \
--search-prefix "$PREFIX" \
--zig-lib-dir "$PWD/../lib" \
diff --git a/ci/powerpc64le-linux-debug.sh b/ci/powerpc64le-linux-debug.sh
@@ -48,6 +48,7 @@ stage3-debug/bin/zig build test docs \
--maxrss ${ZSF_MAX_RSS:-0} \
-Dstatic-llvm \
-Dskip-non-native \
+ -Dskip-test-incremental \
-Dtarget=native-native-musl \
-Dcpu=native+longcall \
--search-prefix "$PREFIX" \
diff --git a/ci/powerpc64le-linux-release.sh b/ci/powerpc64le-linux-release.sh
@@ -48,6 +48,7 @@ stage3-release/bin/zig build test docs \
--maxrss ${ZSF_MAX_RSS:-0} \
-Dstatic-llvm \
-Dskip-non-native \
+ -Dskip-test-incremental \
-Dtarget=native-native-musl \
-Dcpu=native+longcall \
--search-prefix "$PREFIX" \
diff --git a/ci/s390x-linux-debug.sh b/ci/s390x-linux-debug.sh
@@ -48,6 +48,7 @@ stage3-debug/bin/zig build test docs \
--maxrss ${ZSF_MAX_RSS:-0} \
-Dstatic-llvm \
-Dskip-non-native \
+ -Dskip-test-incremental \
-Dtarget=native-native-musl \
--search-prefix "$PREFIX" \
--zig-lib-dir "$PWD/../lib" \
diff --git a/ci/s390x-linux-release.sh b/ci/s390x-linux-release.sh
@@ -48,6 +48,7 @@ stage3-release/bin/zig build test docs \
--maxrss ${ZSF_MAX_RSS:-0} \
-Dstatic-llvm \
-Dskip-non-native \
+ -Dskip-test-incremental \
-Dtarget=native-native-musl \
--search-prefix "$PREFIX" \
--zig-lib-dir "$PWD/../lib" \
diff --git a/ci/x86_64-freebsd-debug.sh b/ci/x86_64-freebsd-debug.sh
@@ -53,6 +53,7 @@ stage3-debug/bin/zig build test docs \
-Dskip-openbsd \
-Dskip-windows \
-Dskip-darwin \
+ -Dskip-test-incremental \
--search-prefix "$PREFIX" \
--zig-lib-dir "$PWD/../lib" \
--test-timeout 2m
diff --git a/ci/x86_64-freebsd-release.sh b/ci/x86_64-freebsd-release.sh
@@ -53,6 +53,7 @@ stage3-release/bin/zig build test docs \
-Dskip-openbsd \
-Dskip-windows \
-Dskip-darwin \
+ -Dskip-test-incremental \
--search-prefix "$PREFIX" \
--zig-lib-dir "$PWD/../lib" \
--test-timeout 2m
diff --git a/ci/x86_64-linux-debug-llvm.sh b/ci/x86_64-linux-debug-llvm.sh
@@ -62,6 +62,7 @@ stage3-debug/bin/zig build test docs \
-Dskip-openbsd \
-Dskip-windows \
-Dskip-darwin \
+ -Dskip-test-incremental \
-Dtarget=native-native-musl \
--search-prefix "$PREFIX" \
--zig-lib-dir "$PWD/../lib" \
diff --git a/ci/x86_64-linux-debug.sh b/ci/x86_64-linux-debug.sh
@@ -62,6 +62,7 @@ stage3-debug/bin/zig build test docs \
-Dskip-windows \
-Dskip-darwin \
-Dskip-llvm \
+ -Dskip-test-incremental \
-Dtarget=native-native-musl \
--search-prefix "$PREFIX" \
--zig-lib-dir "$PWD/../lib" \
diff --git a/ci/x86_64-linux-release.sh b/ci/x86_64-linux-release.sh
@@ -62,6 +62,7 @@ stage3-release/bin/zig build test docs \
-fqemu \
-fwasmtime \
-Dstatic-llvm \
+ -Dskip-test-incremental \
-Dtarget=native-native-musl \
--search-prefix "$PREFIX" \
--zig-lib-dir "$PWD/../lib" \
diff --git a/ci/x86_64-netbsd-debug.sh b/ci/x86_64-netbsd-debug.sh
@@ -0,0 +1,63 @@
+#!/bin/sh
+
+# Requires cmake ninja-build
+
+set -x
+set -e
+
+TARGET="x86_64-netbsd-none"
+MCPU="baseline"
+CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.2287+eb3f16db5"
+PREFIX="$HOME/deps/$CACHE_BASENAME"
+ZIG="$PREFIX/bin/zig"
+
+# Override the cache directories because they won't actually help other CI runs
+# which will be testing alternate versions of zig, and ultimately would just
+# fill up space on the hard drive for no reason.
+export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
+export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
+
+mkdir build-debug
+cd build-debug
+
+export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
+export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
+
+cmake .. \
+ -DCMAKE_INSTALL_PREFIX="stage3-debug" \
+ -DCMAKE_PREFIX_PATH="$PREFIX" \
+ -DCMAKE_BUILD_TYPE=Debug \
+ -DZIG_TARGET_TRIPLE="$TARGET" \
+ -DZIG_TARGET_MCPU="$MCPU" \
+ -DZIG_STATIC=ON \
+ -DZIG_NO_LIB=ON \
+ -GNinja \
+ -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \
+ -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE
+# https://github.com/ziglang/zig/issues/22213
+
+# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
+# so that installation and testing do not get affected by them.
+unset CC
+unset CXX
+
+ninja install
+
+stage3-debug/bin/zig build test docs \
+ --maxrss ${ZSF_MAX_RSS:-0} \
+ -Dstatic-llvm \
+ -Dskip-non-native \
+ -Dskip-test-incremental \
+ --search-prefix "$PREFIX" \
+ --zig-lib-dir "$PWD/../lib" \
+ --test-timeout 2m
+
+stage3-debug/bin/zig build \
+ --prefix stage4-debug \
+ -Denable-llvm \
+ -Dno-lib \
+ -Dtarget=$TARGET \
+ -Duse-zig-libcxx \
+ -Dversion-string="$(stage3-debug/bin/zig version)"
+
+stage4-debug/bin/zig test ../test/behavior.zig
diff --git a/ci/x86_64-netbsd-release.sh b/ci/x86_64-netbsd-release.sh
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+# Requires cmake ninja-build
+
+set -x
+set -e
+
+TARGET="x86_64-netbsd-none"
+MCPU="baseline"
+CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.2287+eb3f16db5"
+PREFIX="$HOME/deps/$CACHE_BASENAME"
+ZIG="$PREFIX/bin/zig"
+
+# Override the cache directories because they won't actually help other CI runs
+# which will be testing alternate versions of zig, and ultimately would just
+# fill up space on the hard drive for no reason.
+export ZIG_GLOBAL_CACHE_DIR="$PWD/zig-global-cache"
+export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
+
+mkdir build-release
+cd build-release
+
+export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
+export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
+
+cmake .. \
+ -DCMAKE_INSTALL_PREFIX="stage3-release" \
+ -DCMAKE_PREFIX_PATH="$PREFIX" \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DZIG_TARGET_TRIPLE="$TARGET" \
+ -DZIG_TARGET_MCPU="$MCPU" \
+ -DZIG_STATIC=ON \
+ -DZIG_NO_LIB=ON \
+ -GNinja \
+ -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \
+ -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE
+# https://github.com/ziglang/zig/issues/22213
+
+# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
+# so that installation and testing do not get affected by them.
+unset CC
+unset CXX
+
+ninja install
+
+stage3-release/bin/zig build test docs \
+ --maxrss ${ZSF_MAX_RSS:-0} \
+ -Dstatic-llvm \
+ -Dskip-non-native \
+ -Dskip-test-incremental \
+ --search-prefix "$PREFIX" \
+ --zig-lib-dir "$PWD/../lib" \
+ --test-timeout 2m
+
+# Ensure that stage3 and stage4 are byte-for-byte identical.
+stage3-release/bin/zig build \
+ --prefix stage4-release \
+ -Denable-llvm \
+ -Dno-lib \
+ -Doptimize=ReleaseFast \
+ -Dstrip \
+ -Dtarget=$TARGET \
+ -Duse-zig-libcxx \
+ -Dversion-string="$(stage3-release/bin/zig version)"
+
+# diff returns an error code if the files differ.
+echo "If the following command fails, it means nondeterminism has been"
+echo "introduced, making stage3 and stage4 no longer byte-for-byte identical."
+diff stage3-release/bin/zig stage4-release/bin/zig
diff --git a/ci/x86_64-openbsd-debug.sh b/ci/x86_64-openbsd-debug.sh
@@ -47,6 +47,7 @@ stage3-debug/bin/zig build test docs \
--maxrss ${ZSF_MAX_RSS:-0} \
-Dstatic-llvm \
-Dskip-non-native \
+ -Dskip-test-incremental \
--search-prefix "$PREFIX" \
--zig-lib-dir "$PWD/../lib" \
--test-timeout 2m
diff --git a/ci/x86_64-openbsd-release.sh b/ci/x86_64-openbsd-release.sh
@@ -47,6 +47,7 @@ stage3-release/bin/zig build test docs \
--maxrss ${ZSF_MAX_RSS:-0} \
-Dstatic-llvm \
-Dskip-non-native \
+ -Dskip-test-incremental \
--search-prefix "$PREFIX" \
--zig-lib-dir "$PWD/../lib" \
--test-timeout 2m
diff --git a/doc/langref/cImport_builtin.zig b/doc/langref/cImport_builtin.zig
@@ -4,6 +4,7 @@ const c = @cImport({
@cInclude("stdio.h");
});
pub fn main() void {
+ if (@import("builtin").os.tag == .netbsd) return; // https://github.com/Vexu/arocc/issues/960
_ = c.printf("hello\n");
}
diff --git a/doc/langref/verbose_cimport_flag.zig b/doc/langref/verbose_cimport_flag.zig
@@ -3,6 +3,7 @@ const c = @cImport({
@cInclude("stdio.h");
});
pub fn main() void {
+ if (@import("builtin").os.tag == .netbsd) return; // https://github.com/Vexu/arocc/issues/960
_ = c;
}
