From e64e8d62ddf87e4665be73d95156e902a4b26d5b Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 5 Nov 2018 09:46:31 -0500 Subject: [PATCH] ci: display environment variables --- ci/azure/linux_script | 2 +- ci/azure/macos_script | 2 +- ci/azure/update_download_page | 1 + ci/azure/windows_script.bat | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ci/azure/linux_script b/ci/azure/linux_script index 6538c2145a..976e53b5c1 100755 --- a/ci/azure/linux_script +++ b/ci/azure/linux_script @@ -20,7 +20,7 @@ mkdir build cd build cmake .. -DCMAKE_BUILD_TYPE=Release make -j2 install -./zig build --build-file ../build.zig test +./zig build --build-file ../build.zig test-behavior -Dskip-release if [ "${BUILD_REASON}" != "PullRequest" ]; then ARTIFACTSDIR="$BUILDDIR/artifacts" diff --git a/ci/azure/macos_script b/ci/azure/macos_script index 67e42d0e9d..3694e1aad6 100755 --- a/ci/azure/macos_script +++ b/ci/azure/macos_script @@ -77,7 +77,7 @@ mkdir build cd build cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_INSTALL_PREFIX=$(pwd)/release -DZIG_STATIC=ON make $JOBS install -release/bin/zig build --build-file ../build.zig test +release/bin/zig build --build-file ../build.zig docs if [ "${BUILD_REASON}" != "PullRequest" ]; then mv ../LICENSE release/ diff --git a/ci/azure/update_download_page b/ci/azure/update_download_page index 4be8337f1c..daaf467c27 100755 --- a/ci/azure/update_download_page +++ b/ci/azure/update_download_page @@ -24,6 +24,7 @@ export SRC_BYTESIZE=$(wc -c < $SRC_TARBALL) git clone https://github.com/ziglang/www.ziglang.org --depth 1 cd www.ziglang.org export MASTER_DATE=$(date +%Y-%m-%d) +env "../$ZIG" run update-download-page.zig mv "$DOWNLOADSECUREFILE_SECUREFILEPATH" "$HOME/.s3cfg" diff --git a/ci/azure/windows_script.bat b/ci/azure/windows_script.bat index 68291a64cd..a4aaf55938 100644 --- a/ci/azure/windows_script.bat +++ b/ci/azure/windows_script.bat @@ -20,7 +20,7 @@ cd %ZIGBUILDDIR% cmake.exe .. -Thost=x64 -G"Visual Studio 15 2017 Win64" "-DCMAKE_INSTALL_PREFIX=%ZIGINSTALLDIR%" "-DCMAKE_PREFIX_PATH=%ZIGPREFIXPATH%" -DCMAKE_BUILD_TYPE=Release || exit /b msbuild /p:Configuration=Release INSTALL.vcxproj || exit /b -"%ZIGINSTALLDIR%\bin\zig.exe" build --build-file ..\build.zig test || exit /b +"%ZIGINSTALLDIR%\bin\zig.exe" build --build-file ..\build.zig docs || exit /b set "PATH=%CD:~0,2%\msys64\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem" SET "MSYSTEM=MINGW64"