Skip to content

Commit 7c15533

Browse files
committed
CI: windows: build stage3 directly from dev kit
1 parent 235a390 commit 7c15533

File tree

1 file changed

+7
-19
lines changed

1 file changed

+7
-19
lines changed

ci/azure/pipelines.yml

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
vmImage: 'windows-2019'
2828
variables:
2929
TARGET: 'x86_64-windows-gnu'
30-
ZIG_LLVM_CLANG_LLD_NAME: 'zig+llvm+lld+clang-${{ variables.TARGET }}-0.10.0-dev.2931+bdf3fa12f'
30+
ZIG_LLVM_CLANG_LLD_NAME: 'zig+llvm+lld+clang-${{ variables.TARGET }}-0.10.0-dev.3524+74673b7f6'
3131
ZIG_LLVM_CLANG_LLD_URL: 'https://ziglang.org/deps/${{ variables.ZIG_LLVM_CLANG_LLD_NAME }}.zip'
3232
steps:
3333
- pwsh: |
@@ -49,12 +49,6 @@ jobs:
4949
git fetch --unshallow # `git describe` won't work on a shallow repo
5050
}
5151
52-
# The dev kit zip file that we have here is old, and may be incompatible with
53-
# the build.zig script of master branch. So we keep an old version of build.zig
54-
# here in the CI directory.
55-
mv build.zig build.zig.master
56-
mv ci/azure/build.zig build.zig
57-
5852
mkdir $ZIGBUILDDIR
5953
cd $ZIGBUILDDIR
6054
@@ -66,27 +60,21 @@ jobs:
6660
-Drelease `
6761
-Dstrip `
6862
-Duse-zig-libcxx `
69-
-Dtarget=$(TARGET)
63+
-Dtarget=$(TARGET) `
64+
-fno-stage1
7065
7166
cd -
72-
73-
# Now that we have built an up-to-date zig.exe, we restore the original
74-
# build script from master branch.
75-
rm build.zig
76-
mv build.zig.master build.zig
77-
7867
name: build
7968
displayName: 'Build'
8069
8170
- pwsh: |
8271
Set-Variable -Name ZIGINSTALLDIR -Value "$(Get-Location)\build\dist"
8372
84-
# Sadly, stage2 is omitted from this build to save memory on the CI server. Once self-hosted is
85-
# built with itself and does not gobble as much memory, we can enable these tests.
86-
#& "$ZIGINSTALLDIR\bin\zig.exe" test "..\test\behavior.zig" -fno-stage1 -fLLVM -I "..\test" 2>&1
73+
& "$ZIGINSTALLDIR\bin\zig.exe" build test `
74+
--search-prefix "$ZIGPREFIXPATH" `
75+
-Dstatic-llvm `
76+
-Dskip-non-native
8777
88-
& "$ZIGINSTALLDIR\bin\zig.exe" build test-toolchain -Dskip-non-native -Dskip-stage2-tests 2>&1
89-
& "$ZIGINSTALLDIR\bin\zig.exe" build test-std -Dskip-non-native 2>&1
9078
name: test
9179
displayName: 'Test'
9280

0 commit comments

Comments
 (0)