authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-08-29 23:37:31-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-08-29 23:37:31-07:00
log75d5a4b9a255895246762f27399e14821bc0e768
treecbfbc606cc5ee6ba82779730d04df8621ff2dbf9
parent6f9b7c8ceebf9276892b2185e517400f5b729b80

CI: pass explicit zig lib dir in lots of places

see #12684 for motivation

12 files changed, 46 insertions(+), 21 deletions(-)

ci/azure/macos_script+1
...@@ -49,6 +49,7 @@ unset CXX...@@ -49,6 +49,7 @@ unset CXX
49make $JOBS install49make $JOBS install
5050
51stage3-release/bin/zig build test docs \51stage3-release/bin/zig build test docs \
52 --zig-lib-dir ../lib \
52 -Denable-macos-sdk \53 -Denable-macos-sdk \
53 -Dstatic-llvm \54 -Dstatic-llvm \
54 --search-prefix "$PREFIX"55 --search-prefix "$PREFIX"
ci/azure/pipelines.yml+2
...@@ -60,6 +60,7 @@ jobs:...@@ -60,6 +60,7 @@ jobs:
60 displayName: 'Build'60 displayName: 'Build'
6161
62 - pwsh: |62 - pwsh: |
63 Set-Variable -Name ZIGLIBDIR -Value "$(Get-Location)\lib"
63 Set-Variable -Name ZIGINSTALLDIR -Value "$(Get-Location)\stage3-release"64 Set-Variable -Name ZIGINSTALLDIR -Value "$(Get-Location)\stage3-release"
6465
65 function CheckLastExitCode {66 function CheckLastExitCode {
...@@ -71,6 +72,7 @@ jobs:...@@ -71,6 +72,7 @@ jobs:
7172
72 & "$ZIGINSTALLDIR\bin\zig.exe" build test docs `73 & "$ZIGINSTALLDIR\bin\zig.exe" build test docs `
73 --search-prefix "$ZIGPREFIXPATH" `74 --search-prefix "$ZIGPREFIXPATH" `
75 --zig-lib-dir "$ZIGLIBDIR" `
74 -Dstatic-llvm `76 -Dstatic-llvm `
75 -Dskip-non-native `77 -Dskip-non-native `
76 -Dskip-stage2-tests78 -Dskip-stage2-tests
ci/drone/test_linux_behavior+4-4
...@@ -7,7 +7,7 @@ INSTALL_PREFIX="$DRONE_WORKSPACE/stage3-release"...@@ -7,7 +7,7 @@ INSTALL_PREFIX="$DRONE_WORKSPACE/stage3-release"
7ZIG="$INSTALL_PREFIX/bin/zig"7ZIG="$INSTALL_PREFIX/bin/zig"
8export ZIG_GLOBAL_CACHE_DIR="$DRONE_WORKSPACE/zig-cache"8export ZIG_GLOBAL_CACHE_DIR="$DRONE_WORKSPACE/zig-cache"
99
10$ZIG build test-behavior -Dskip-non-native10$ZIG build test-behavior -Dskip-non-native --zig-lib-dir lib
11$ZIG build test-compiler-rt -Dskip-non-native11$ZIG build test-compiler-rt -Dskip-non-native --zig-lib-dir lib
12$ZIG build test-fmt12$ZIG build test-fmt --zig-lib-dir lib
13$ZIG build docs13$ZIG build docs --zig-lib-dir lib
ci/drone/test_linux_cases+3-2
...@@ -7,5 +7,6 @@ INSTALL_PREFIX="$DRONE_WORKSPACE/stage3-release"...@@ -7,5 +7,6 @@ INSTALL_PREFIX="$DRONE_WORKSPACE/stage3-release"
7ZIG="$INSTALL_PREFIX/bin/zig"7ZIG="$INSTALL_PREFIX/bin/zig"
8export ZIG_GLOBAL_CACHE_DIR="$DRONE_WORKSPACE/zig-cache"8export ZIG_GLOBAL_CACHE_DIR="$DRONE_WORKSPACE/zig-cache"
99
10$ZIG build -Dskip-non-native # test building self-hosted without LLVM10# test building self-hosted without LLVM
11$ZIG build -Dskip-non-native test-cases11$ZIG build -Dskip-non-native --zig-lib-dir lib
12$ZIG build test-cases -Dskip-non-native --zig-lib-dir lib
ci/drone/test_linux_misc+7-7
...@@ -7,10 +7,10 @@ INSTALL_PREFIX="$DRONE_WORKSPACE/stage3-release"...@@ -7,10 +7,10 @@ INSTALL_PREFIX="$DRONE_WORKSPACE/stage3-release"
7ZIG="$INSTALL_PREFIX/bin/zig"7ZIG="$INSTALL_PREFIX/bin/zig"
8export ZIG_GLOBAL_CACHE_DIR="$DRONE_WORKSPACE/zig-cache"8export ZIG_GLOBAL_CACHE_DIR="$DRONE_WORKSPACE/zig-cache"
99
10$ZIG build test-universal-libc -Dskip-non-native10$ZIG build test-universal-libc -Dskip-non-native --zig-lib-dir lib
11$ZIG build test-compare-output -Dskip-non-native11$ZIG build test-compare-output -Dskip-non-native --zig-lib-dir lib
12$ZIG build test-standalone -Dskip-non-native -Dskip-release-safe12$ZIG build test-standalone -Dskip-non-native --zig-lib-dir lib -Dskip-release-safe
13$ZIG build test-stack-traces -Dskip-non-native13$ZIG build test-stack-traces -Dskip-non-native --zig-lib-dir lib
14$ZIG build test-cli -Dskip-non-native14$ZIG build test-cli -Dskip-non-native --zig-lib-dir lib
15$ZIG build test-asm-link -Dskip-non-native15$ZIG build test-asm-link -Dskip-non-native --zig-lib-dir lib
16$ZIG build test-translate-c -Dskip-non-native16$ZIG build test-translate-c -Dskip-non-native --zig-lib-dir lib
ci/drone/test_linux_std_Debug+6-1
...@@ -7,4 +7,9 @@ INSTALL_PREFIX="$DRONE_WORKSPACE/stage3-release"...@@ -7,4 +7,9 @@ INSTALL_PREFIX="$DRONE_WORKSPACE/stage3-release"
7ZIG="$INSTALL_PREFIX/bin/zig"7ZIG="$INSTALL_PREFIX/bin/zig"
8export ZIG_GLOBAL_CACHE_DIR="$DRONE_WORKSPACE/zig-cache"8export ZIG_GLOBAL_CACHE_DIR="$DRONE_WORKSPACE/zig-cache"
99
10$ZIG build test-std -Dskip-release-safe -Dskip-release-fast -Dskip-release-small -Dskip-non-native10$ZIG build test-std \
11 --zig-lib-dir lib \
12 -Dskip-release-safe \
13 -Dskip-release-fast \
14 -Dskip-release-small \
15 -Dskip-non-native
ci/drone/test_linux_std_ReleaseFast+7-1
...@@ -7,4 +7,10 @@ INSTALL_PREFIX="$DRONE_WORKSPACE/stage3-release"...@@ -7,4 +7,10 @@ INSTALL_PREFIX="$DRONE_WORKSPACE/stage3-release"
7ZIG="$INSTALL_PREFIX/bin/zig"7ZIG="$INSTALL_PREFIX/bin/zig"
8export ZIG_GLOBAL_CACHE_DIR="$DRONE_WORKSPACE/zig-cache"8export ZIG_GLOBAL_CACHE_DIR="$DRONE_WORKSPACE/zig-cache"
99
10$ZIG build test-std -Dskip-debug -Dskip-release-safe -Dskip-release-small -Dskip-non-native -Dskip-single-threaded10$ZIG build test-std \
11 --zig-lib-dir lib \
12 -Dskip-debug \
13 -Dskip-release-safe \
14 -Dskip-release-small \
15 -Dskip-non-native \
16 -Dskip-single-threaded
ci/drone/test_linux_std_ReleaseSafe+7-1
...@@ -7,4 +7,10 @@ INSTALL_PREFIX="$DRONE_WORKSPACE/stage3-release"...@@ -7,4 +7,10 @@ INSTALL_PREFIX="$DRONE_WORKSPACE/stage3-release"
7ZIG="$INSTALL_PREFIX/bin/zig"7ZIG="$INSTALL_PREFIX/bin/zig"
8export ZIG_GLOBAL_CACHE_DIR="$DRONE_WORKSPACE/zig-cache"8export ZIG_GLOBAL_CACHE_DIR="$DRONE_WORKSPACE/zig-cache"
99
10$ZIG build test-std -Dskip-debug -Dskip-release-fast -Dskip-release-small -Dskip-non-native -Dskip-single-threaded10$ZIG build test-std \
11 --zig-lib-dir lib \
12 -Dskip-debug \
13 -Dskip-release-fast \
14 -Dskip-release-small \
15 -Dskip-non-native \
16 -Dskip-single-threaded
ci/drone/test_linux_std_ReleaseSmall+2-2
...@@ -12,5 +12,5 @@ export ZIG_GLOBAL_CACHE_DIR="$DRONE_WORKSPACE/zig-cache"...@@ -12,5 +12,5 @@ export ZIG_GLOBAL_CACHE_DIR="$DRONE_WORKSPACE/zig-cache"
12# of ReleaseSmall std lib tests.12# of ReleaseSmall std lib tests.
13# $ZIG build test-std -Dskip-debug -Dskip-release-safe -Dskip-release-fast -Dskip-non-native13# $ZIG build test-std -Dskip-debug -Dskip-release-safe -Dskip-release-fast -Dskip-non-native
1414
15$ZIG test lib/std/std.zig -OReleaseSmall15$ZIG test lib/std/std.zig -OReleaseSmall --zig-lib-dir lib
16$ZIG test lib/std/std.zig -OReleaseSmall -lc16$ZIG test lib/std/std.zig -OReleaseSmall -lc --zig-lib-dir lib
ci/srht/freebsd_script+1
...@@ -56,6 +56,7 @@ ZIG_LIBC="$ZIG_LIBC_TXT" samu install...@@ -56,6 +56,7 @@ ZIG_LIBC="$ZIG_LIBC_TXT" samu install
5656
57# Here we skip some tests to save time.57# Here we skip some tests to save time.
58stage3/bin/zig build test docs \58stage3/bin/zig build test docs \
59 --zig-lib-dir ../lib \
59 -Dstatic-llvm \60 -Dstatic-llvm \
60 --search-prefix "$PREFIX" \61 --search-prefix "$PREFIX" \
61 -Dskip-stage1 \62 -Dskip-stage1 \
ci/zinc/linux_test_stage3_debug+2-1
...@@ -55,7 +55,8 @@ stage3/bin/zig build test \...@@ -55,7 +55,8 @@ stage3/bin/zig build test \
55 -fwasmtime \55 -fwasmtime \
56 -Dstatic-llvm \56 -Dstatic-llvm \
57 -Dtarget=native-native-musl \57 -Dtarget=native-native-musl \
58 --search-prefix "$DEPS_LOCAL"58 --search-prefix "$DEPS_LOCAL" \
59 --zig-lib-dir ../lib
5960
60# Explicit exit helps show last command duration.61# Explicit exit helps show last command duration.
61exit62exit
ci/zinc/linux_test_stage3_release+4-2
...@@ -40,13 +40,15 @@ ninja install...@@ -40,13 +40,15 @@ ninja install
40 -fwasmtime \40 -fwasmtime \
41 -Dstatic-llvm \41 -Dstatic-llvm \
42 -Dtarget=native-native-musl \42 -Dtarget=native-native-musl \
43 --search-prefix "$DEPS_LOCAL"43 --search-prefix "$DEPS_LOCAL" \
44 --zig-lib-dir ../lib
4445
45# Produce the experimental std lib documentation.46# Produce the experimental std lib documentation.
46mkdir -p "$RELEASE_STAGING/docs/std"47mkdir -p "$RELEASE_STAGING/docs/std"
47"$RELEASE_STAGING/bin/zig" test ../lib/std/std.zig \48"$RELEASE_STAGING/bin/zig" test ../lib/std/std.zig \
48 -femit-docs=$RELEASE_STAGING/docs/std \49 -femit-docs=$RELEASE_STAGING/docs/std \
49 -fno-emit-bin50 -fno-emit-bin \
51 --zig-lib-dir ../lib
5052
51cp ../LICENSE $RELEASE_STAGING/53cp ../LICENSE $RELEASE_STAGING/
52cp ../zig-cache/langref.html $RELEASE_STAGING/docs/54cp ../zig-cache/langref.html $RELEASE_STAGING/docs/