authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-04-21 18:57:59-04:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2022-04-21 18:57:59-04:00
log804d0661f5afdc1ca10a3f6d127a7631bcfa940b
tree9a8ec99a571afd6a813d84d313f8db4168e44e0c
parent41654a318db526465754ae084cc37896382eb0d2
parentffaa045429c946eaafc199e82b8831cb1e2f637d
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #11448 from ziglang/ci-stage3

CI: additionally test building stage3

2 files changed, 6 insertions(+), 3 deletions(-)

ci/zinc/linux_test.sh+5-3
...@@ -48,7 +48,10 @@ cd $WORKSPACE...@@ -48,7 +48,10 @@ cd $WORKSPACE
48$ZIG fmt --check . --exclude test/compile_errors/48$ZIG fmt --check . --exclude test/compile_errors/
4949
50# Build stage2 standalone so that we can test stage2 against stage2 compiler-rt.50# Build stage2 standalone so that we can test stage2 against stage2 compiler-rt.
51$ZIG build -p stage2 -Denable-llvm -Duse-zig-libcxx51$ZIG build -p stage2 -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
52
53# Ensure that stage2 can build itself.
54./stage2/bin/zig build -p stage3 -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
5255
53stage2/bin/zig test test/behavior.zig -I test -fLLVM56stage2/bin/zig test test/behavior.zig -I test -fLLVM
54stage2/bin/zig test test/behavior.zig -I test -fno-LLVM57stage2/bin/zig test test/behavior.zig -I test -fno-LLVM
...@@ -95,8 +98,7 @@ tidy --drop-empty-elements no -qe zig-cache/langref.html...@@ -95,8 +98,7 @@ tidy --drop-empty-elements no -qe zig-cache/langref.html
95$ZIG build \98$ZIG build \
96 --prefix "$RELEASE_STAGING" \99 --prefix "$RELEASE_STAGING" \
97 --search-prefix "$DEPS_LOCAL" \100 --search-prefix "$DEPS_LOCAL" \
98 -Denable-llvm \101 -Dstatic-llvm \
99 -Duse-zig-libcxx \
100 -Drelease \102 -Drelease \
101 -Dstrip \103 -Dstrip \
102 -Dtarget="$TARGET" \104 -Dtarget="$TARGET" \
src/Compilation.zig+1
...@@ -1224,6 +1224,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {...@@ -1224,6 +1224,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
12241224
1225 // This is shared hasher state common to zig source and all C source files.1225 // This is shared hasher state common to zig source and all C source files.
1226 cache.hash.addBytes(build_options.version);1226 cache.hash.addBytes(build_options.version);
1227 cache.hash.add(builtin.zig_backend);
1227 cache.hash.addBytes(options.zig_lib_directory.path orelse ".");1228 cache.hash.addBytes(options.zig_lib_directory.path orelse ".");
1228 cache.hash.add(options.optimize_mode);1229 cache.hash.add(options.optimize_mode);
1229 cache.hash.add(options.target.cpu.arch);1230 cache.hash.add(options.target.cpu.arch);