Commit 75d5a4b9a2

Andrew Kelley <andrew@ziglang.org>
2022-08-30 08:37:31
CI: pass explicit zig lib dir in lots of places
see #12684 for motivation
master
1 parent 6f9b7c8
Changed files (12)
ci
azure
macos_script
pipelines.yml
drone
test_linux_behavior
test_linux_cases
test_linux_misc
test_linux_std_Debug
test_linux_std_ReleaseFast
test_linux_std_ReleaseSafe
test_linux_std_ReleaseSmall
srht
freebsd_script
zinc
linux_test_stage3_debug
linux_test_stage3_release
ci/azure/macos_script
@@ -49,6 +49,7 @@ unset CXX
 make $JOBS install
 
 stage3-release/bin/zig build test docs \
+  --zig-lib-dir ../lib \
   -Denable-macos-sdk \
   -Dstatic-llvm \
   --search-prefix "$PREFIX"
ci/azure/pipelines.yml
@@ -60,6 +60,7 @@ jobs:
     displayName: 'Build'
 
   - pwsh: |
+      Set-Variable -Name ZIGLIBDIR -Value "$(Get-Location)\lib"
       Set-Variable -Name ZIGINSTALLDIR -Value "$(Get-Location)\stage3-release"
 
       function CheckLastExitCode {
@@ -71,6 +72,7 @@ jobs:
 
       & "$ZIGINSTALLDIR\bin\zig.exe" build test docs `
         --search-prefix "$ZIGPREFIXPATH" `
+        --zig-lib-dir "$ZIGLIBDIR" `
         -Dstatic-llvm `
         -Dskip-non-native `
         -Dskip-stage2-tests
ci/drone/test_linux_behavior
@@ -7,7 +7,7 @@ INSTALL_PREFIX="$DRONE_WORKSPACE/stage3-release"
 ZIG="$INSTALL_PREFIX/bin/zig"
 export ZIG_GLOBAL_CACHE_DIR="$DRONE_WORKSPACE/zig-cache"
 
-$ZIG build test-behavior    -Dskip-non-native
-$ZIG build test-compiler-rt -Dskip-non-native
-$ZIG build test-fmt
-$ZIG build docs
+$ZIG build test-behavior    -Dskip-non-native --zig-lib-dir lib
+$ZIG build test-compiler-rt -Dskip-non-native --zig-lib-dir lib
+$ZIG build test-fmt                           --zig-lib-dir lib
+$ZIG build docs                               --zig-lib-dir lib
ci/drone/test_linux_cases
@@ -7,5 +7,6 @@ INSTALL_PREFIX="$DRONE_WORKSPACE/stage3-release"
 ZIG="$INSTALL_PREFIX/bin/zig"
 export ZIG_GLOBAL_CACHE_DIR="$DRONE_WORKSPACE/zig-cache"
 
-$ZIG build -Dskip-non-native # test building self-hosted without LLVM
-$ZIG build -Dskip-non-native test-cases
+# test building self-hosted without LLVM
+$ZIG build            -Dskip-non-native --zig-lib-dir lib
+$ZIG build test-cases -Dskip-non-native --zig-lib-dir lib
ci/drone/test_linux_misc
@@ -7,10 +7,10 @@ INSTALL_PREFIX="$DRONE_WORKSPACE/stage3-release"
 ZIG="$INSTALL_PREFIX/bin/zig"
 export ZIG_GLOBAL_CACHE_DIR="$DRONE_WORKSPACE/zig-cache"
 
-$ZIG build test-universal-libc -Dskip-non-native
-$ZIG build test-compare-output -Dskip-non-native
-$ZIG build test-standalone     -Dskip-non-native -Dskip-release-safe
-$ZIG build test-stack-traces   -Dskip-non-native
-$ZIG build test-cli            -Dskip-non-native
-$ZIG build test-asm-link       -Dskip-non-native
-$ZIG build test-translate-c    -Dskip-non-native
+$ZIG build test-universal-libc -Dskip-non-native --zig-lib-dir lib
+$ZIG build test-compare-output -Dskip-non-native --zig-lib-dir lib
+$ZIG build test-standalone     -Dskip-non-native --zig-lib-dir lib -Dskip-release-safe
+$ZIG build test-stack-traces   -Dskip-non-native --zig-lib-dir lib
+$ZIG build test-cli            -Dskip-non-native --zig-lib-dir lib
+$ZIG build test-asm-link       -Dskip-non-native --zig-lib-dir lib
+$ZIG build test-translate-c    -Dskip-non-native --zig-lib-dir lib
ci/drone/test_linux_std_Debug
@@ -7,4 +7,9 @@ INSTALL_PREFIX="$DRONE_WORKSPACE/stage3-release"
 ZIG="$INSTALL_PREFIX/bin/zig"
 export ZIG_GLOBAL_CACHE_DIR="$DRONE_WORKSPACE/zig-cache"
 
-$ZIG build test-std -Dskip-release-safe -Dskip-release-fast -Dskip-release-small -Dskip-non-native
+$ZIG build test-std \
+  --zig-lib-dir lib \
+  -Dskip-release-safe \
+  -Dskip-release-fast \
+  -Dskip-release-small \
+  -Dskip-non-native
ci/drone/test_linux_std_ReleaseFast
@@ -7,4 +7,10 @@ INSTALL_PREFIX="$DRONE_WORKSPACE/stage3-release"
 ZIG="$INSTALL_PREFIX/bin/zig"
 export ZIG_GLOBAL_CACHE_DIR="$DRONE_WORKSPACE/zig-cache"
 
-$ZIG build test-std -Dskip-debug -Dskip-release-safe -Dskip-release-small -Dskip-non-native -Dskip-single-threaded
+$ZIG build test-std \
+  --zig-lib-dir lib \
+  -Dskip-debug \
+  -Dskip-release-safe \
+  -Dskip-release-small \
+  -Dskip-non-native \
+  -Dskip-single-threaded
ci/drone/test_linux_std_ReleaseSafe
@@ -7,4 +7,10 @@ INSTALL_PREFIX="$DRONE_WORKSPACE/stage3-release"
 ZIG="$INSTALL_PREFIX/bin/zig"
 export ZIG_GLOBAL_CACHE_DIR="$DRONE_WORKSPACE/zig-cache"
 
-$ZIG build test-std -Dskip-debug -Dskip-release-fast -Dskip-release-small -Dskip-non-native -Dskip-single-threaded
+$ZIG build test-std \
+  --zig-lib-dir lib \
+  -Dskip-debug \
+  -Dskip-release-fast \
+  -Dskip-release-small \
+  -Dskip-non-native \
+  -Dskip-single-threaded
ci/drone/test_linux_std_ReleaseSmall
@@ -12,5 +12,5 @@ export ZIG_GLOBAL_CACHE_DIR="$DRONE_WORKSPACE/zig-cache"
 # of ReleaseSmall std lib tests.
 # $ZIG build test-std -Dskip-debug -Dskip-release-safe -Dskip-release-fast -Dskip-non-native
 
-$ZIG test lib/std/std.zig -OReleaseSmall
-$ZIG test lib/std/std.zig -OReleaseSmall -lc
+$ZIG test lib/std/std.zig -OReleaseSmall     --zig-lib-dir lib
+$ZIG test lib/std/std.zig -OReleaseSmall -lc --zig-lib-dir lib
ci/srht/freebsd_script
@@ -56,6 +56,7 @@ ZIG_LIBC="$ZIG_LIBC_TXT" samu install
 
 # Here we skip some tests to save time.
 stage3/bin/zig build test docs \
+  --zig-lib-dir ../lib \
   -Dstatic-llvm \
   --search-prefix "$PREFIX" \
   -Dskip-stage1 \
ci/zinc/linux_test_stage3_debug
@@ -55,7 +55,8 @@ stage3/bin/zig build test \
   -fwasmtime \
   -Dstatic-llvm \
   -Dtarget=native-native-musl \
-  --search-prefix "$DEPS_LOCAL"
+  --search-prefix "$DEPS_LOCAL" \
+  --zig-lib-dir ../lib
 
 # Explicit exit helps show last command duration.
 exit
ci/zinc/linux_test_stage3_release
@@ -40,13 +40,15 @@ ninja install
   -fwasmtime \
   -Dstatic-llvm \
   -Dtarget=native-native-musl \
-  --search-prefix "$DEPS_LOCAL"
+  --search-prefix "$DEPS_LOCAL" \
+  --zig-lib-dir ../lib
 
 # Produce the experimental std lib documentation.
 mkdir -p "$RELEASE_STAGING/docs/std"
 "$RELEASE_STAGING/bin/zig" test ../lib/std/std.zig \
   -femit-docs=$RELEASE_STAGING/docs/std \
-  -fno-emit-bin
+  -fno-emit-bin \
+  --zig-lib-dir ../lib
 
 cp ../LICENSE $RELEASE_STAGING/
 cp ../zig-cache/langref.html $RELEASE_STAGING/docs/