authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-08-10 18:53:09-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-08-19 16:45:15-07:00
log9f43ebd6ef753e2e6a8ab8266724720329ea5846
tree45d234e130e670f2d89f1e1e28efee406e97fb66
parentd75d40dfdfeb82dc9b1b2b5cdcd3fdb8105ac97d

CI: windows: build stage3 directly from dev kit

1 files changed, 7 insertions(+), 21 deletions(-)

ci/azure/pipelines.yml+7-21
...@@ -56,12 +56,6 @@ jobs:...@@ -56,12 +56,6 @@ jobs:
56 git fetch --unshallow # `git describe` won't work on a shallow repo56 git fetch --unshallow # `git describe` won't work on a shallow repo
57 }57 }
5858
59 # The dev kit zip file that we have here is old, and may be incompatible with
60 # the build.zig script of master branch. So we keep an old version of build.zig
61 # here in the CI directory.
62 mv build.zig build.zig.master
63 mv ci/azure/build.zig build.zig
64
65 mkdir $ZIGBUILDDIR59 mkdir $ZIGBUILDDIR
66 cd $ZIGBUILDDIR60 cd $ZIGBUILDDIR
6761
...@@ -73,16 +67,11 @@ jobs:...@@ -73,16 +67,11 @@ jobs:
73 -Drelease `67 -Drelease `
74 -Dstrip `68 -Dstrip `
75 -Duse-zig-libcxx `69 -Duse-zig-libcxx `
76 -Dtarget=$(TARGET)70 -Dtarget=$(TARGET) `
71 -fno-stage1
77 CheckLastExitCode72 CheckLastExitCode
7873
79 cd -74 cd -
80
81 # Now that we have built an up-to-date zig.exe, we restore the original
82 # build script from master branch.
83 rm build.zig
84 mv build.zig.master build.zig
85
86 name: build75 name: build
87 displayName: 'Build'76 displayName: 'Build'
8877
...@@ -96,15 +85,12 @@ jobs:...@@ -96,15 +85,12 @@ jobs:
96 return 085 return 0
97 }86 }
9887
99 # Sadly, stage2 is omitted from this build to save memory on the CI server. Once self-hosted is88 & "$ZIGINSTALLDIR\bin\zig.exe" build test `
100 # built with itself and does not gobble as much memory, we can enable these tests.89 --search-prefix "$ZIGPREFIXPATH" `
101 #& "$ZIGINSTALLDIR\bin\zig.exe" test "..\test\behavior.zig" -fno-stage1 -fLLVM -I "..\test" 2>&190 -Dstatic-llvm `
102 #CheckLastExitCode91 -Dskip-non-native
103
104 & "$ZIGINSTALLDIR\bin\zig.exe" build test-toolchain -Dskip-non-native -Dskip-stage2-tests -Domit-stage2 2>&1
105 CheckLastExitCode
106 & "$ZIGINSTALLDIR\bin\zig.exe" build test-std -Dskip-non-native 2>&1
107 CheckLastExitCode92 CheckLastExitCode
93
108 name: test94 name: test
109 displayName: 'Test'95 displayName: 'Test'
11096