Commit 3b4e29f1ad690d4437aa4d0cb1c7f01c26b76c4a | zig

author	Noam Preil <noam@pixelhero.dev> 2020-05-27 14:17:46-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-05-29 13:34:15-04:00
log	3b4e29f1ad690d4437aa4d0cb1c7f01c26b76c4a
tree	3a75824ecf0ed3969f022996e0e8337ab878daa7
parent	834e8ac2dcdec6e1055a6c90600bcc120484176e

2 files changed, 6 insertions(+), 6 deletions(-)

ci/azure/linux_script+3-3

...	...	@@ -12,7 +12,7 @@ sudo apt-get update -q
12	12
13	13	sudo apt-get remove -y llvm-*
14	14	sudo rm -rf /usr/local/*
15		sudo apt-get install -y libxml2-dev libclang-10-dev llvm-10 llvm-10-dev liblld-10-dev cmake s3cmd gcc-7 g++-7
	15	sudo apt-get install -y libxml2-dev libclang-10-dev llvm-10 llvm-10-dev liblld-10-dev cmake s3cmd gcc-7 g++-7 ninja-build
16	16
17	17	QEMUBASE="qemu-linux-x86_64-5.0.0-z2"
18	18	wget https://ziglang.org/deps/$QEMUBASE.tar.xz
...	...	@@ -48,8 +48,8 @@ export CC=gcc-7
48	48	export CXX=g++-7
49	49	mkdir build
50	50	cd build
51		cmake .. -DCMAKE_BUILD_TYPE=Release
52		make -j$(nproc) install
	51	cmake .. -DCMAKE_BUILD_TYPE=Release -GNinja
	52	ninja install
53	53	./zig build test -Denable-qemu -Denable-wasmtime
54	54	VERSION="$(./zig version)"
55	55

ci/drone/linux_script+3-3

...	...	@@ -8,7 +8,7 @@ BUILDDIR="$(pwd)"
8	8	DISTDIR="$(pwd)/dist"
9	9
10	10	apk update
11		apk add py3-pip xz perl-utils jq curl
	11	apk add py3-pip xz perl-utils jq curl samurai
12	12	pip3 install s3cmd
13	13
14	14	# Make the `zig version` number consistent.
...	...	@@ -17,9 +17,9 @@ git config core.abbrev 9
17	17
18	18	mkdir build
19	19	cd build
20		cmake .. -DCMAKE_BUILD_TYPE=Release "-DCMAKE_INSTALL_PREFIX=$DISTDIR" -DZIG_STATIC=ON -DCMAKE_PREFIX_PATH=/deps/local
	20	cmake .. -DCMAKE_BUILD_TYPE=Release "-DCMAKE_INSTALL_PREFIX=$DISTDIR" -DZIG_STATIC=ON -DCMAKE_PREFIX_PATH=/deps/local -GNinja
21	21
22		make -j$(nproc) install
	22	samu install
23	23	./zig build test -Dskip-release -Dskip-non-native
24	24
25	25	if [ -z "$DRONE_PULL_REQUEST" ]; then