authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-11-22 00:56:44-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-01-09 14:37:35-07:00
log5f23b659018825aaf10a157c58cbbe92c64e16ef
treec44125aefa1bf6a1ce8d89bddfc981bc8393dc68
parent8bbb4a2f81b46f2a72a81575b9a9158b0d0bd94c

CI: build from old zig on x86_64-linux debug

This is to work around OOM on the CI server. Once #13560 is complete, we can avoid having to replace the tarballs so often.

4 files changed, 17 insertions(+), 29 deletions(-)

CMakeLists.txt-2
......@@ -1038,8 +1038,6 @@ set(BUILD_ZIG2_ARGS
10381038 -lc
10391039 --pkg-begin build_options "${ZIG_CONFIG_ZIG_OUT}"
10401040 --pkg-end
1041 --pkg-begin compiler_rt "${CMAKE_SOURCE_DIR}/lib/compiler_rt.zig"
1042 --pkg-end
10431041)
10441042
10451043if("${ZIG_EXECUTABLE}" STREQUAL "")
ci/linux/build-x86_64-debug.sh+14-24
......@@ -8,13 +8,13 @@ ARCH="$(uname -m)"
88DEPS_LOCAL="$HOME/local"
99OLD_ZIG="$DEPS_LOCAL/bin/zig"
1010TARGET="${ARCH}-linux-musl"
11MCPU="baseline"
1211
1312mkdir -p "$DEPS_LOCAL"
1413cd "$DEPS_LOCAL"
1514
16wget https://ziglang.org/deps/zig+llvm+lld+clang-x86_64-linux-musl-0.10.0-dev.4560+828735ac0.tar.xz
17tar x --strip-components=1 -f zig+llvm+lld+clang-x86_64-linux-musl-0.10.0-dev.4560+828735ac0.tar.xz
15OLD_ZIG_VERSION="0.11.0-dev.256+271cc52a1"
16wget https://ziglang.org/deps/zig+llvm+lld+clang-x86_64-linux-musl-$OLD_ZIG_VERSION.tar.xz
17tar x --strip-components=1 -f zig+llvm+lld+clang-x86_64-linux-musl-$OLD_ZIG_VERSION.tar.xz
1818
1919wget https://ziglang.org/deps/qemu-linux-x86_64-6.1.0.1.tar.xz
2020tar x --strip-components=1 -f qemu-linux-x86_64-6.1.0.1.tar.xz
......@@ -29,34 +29,24 @@ export PATH=$DEPS_LOCAL/bin:$PATH
2929cd "$ZIGDIR"
3030echo "building stage3-debug with zig version $($OLD_ZIG version)"
3131
32export CC="$OLD_ZIG cc -target $TARGET -mcpu=$MCPU"
33export CXX="$OLD_ZIG c++ -target $TARGET -mcpu=$MCPU"
34
35mkdir build
36cd build
37cmake .. \
38 -DCMAKE_INSTALL_PREFIX="$(pwd)/stage3" \
39 -DCMAKE_PREFIX_PATH="$DEPS_LOCAL" \
40 -DCMAKE_BUILD_TYPE=Debug \
41 -DZIG_STATIC=ON \
42 -DZIG_USE_LLVM_CONFIG=OFF
43
44# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
45# so that installation and testing do not get affected by them.
46unset CC
47unset CXX
48
49make -j2 install
32"$OLD_ZIG" build \
33 --search-prefix "$DEPS_LOCAL" \
34 --zig-lib-dir "$(pwd)/../lib" \
35 -Denable-stage1 \
36 -Dstatic-llvm \
37 -Drelease \
38 -Duse-zig-libcxx \
39 -Dtarget="$TARGET"
5040
5141echo "Looking for non-conforming code formatting..."
52stage3/bin/zig fmt --check .. \
42zig-out/bin/zig fmt --check .. \
5343 --exclude ../test/cases/ \
5444 --exclude ../build
5545
5646# simultaneously test building self-hosted without LLVM and with 32-bit arm
57stage3/bin/zig build -Dtarget=arm-linux-musleabihf
47zig-out/bin/zig build -Dtarget=arm-linux-musleabihf
5848
59stage3/bin/zig build test \
49zig-out/bin/zig build test docs \
6050 -fqemu \
6151 -fwasmtime \
6252 -Dstatic-llvm \
ci/linux/build-x86_64-release.sh+3-2
......@@ -13,8 +13,9 @@ MCPU="baseline"
1313mkdir -p "$DEPS_LOCAL"
1414cd "$DEPS_LOCAL"
1515
16wget https://ziglang.org/deps/zig+llvm+lld+clang-x86_64-linux-musl-0.10.0-dev.4560+828735ac0.tar.xz
17tar x --strip-components=1 -f zig+llvm+lld+clang-x86_64-linux-musl-0.10.0-dev.4560+828735ac0.tar.xz
16OLD_ZIG_VERSION="0.11.0-dev.256+271cc52a1"
17wget https://ziglang.org/deps/zig+llvm+lld+clang-x86_64-linux-musl-$OLD_ZIG_VERSION.tar.xz
18tar x --strip-components=1 -f zig+llvm+lld+clang-x86_64-linux-musl-$OLD_ZIG_VERSION.tar.xz
1819
1920wget https://ziglang.org/deps/qemu-linux-x86_64-6.1.0.1.tar.xz
2021tar x --strip-components=1 -f qemu-linux-x86_64-6.1.0.1.tar.xz
ci/windows/build.ps1-1
......@@ -40,7 +40,6 @@ Write-Output "Building Zig..."
4040 -Denable-stage1 `
4141 -Dstatic-llvm `
4242 -Drelease `
43 -Dstrip `
4443 -Duse-zig-libcxx `
4544 -Dtarget="$TARGET"
4645CheckLastExitCode