Skip to content

Commit 93ef993

Browse files
andrewrkandrewrk
committed
CI: drone: simplify
Instead of a switch in a bash file we just properly name the pipeline steps. Also use zig build to produce the release artifact.
1 parent 6050548 commit 93ef993

10 files changed

+74
-78
lines changed

‎ci/drone/drone.yml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,65 +13,65 @@ steps:
1313
commands:
1414
- ./ci/drone/linux_script_build
1515

16-
- name: test-1
16+
- name: behavior
1717
depends_on:
1818
- build
1919
image: ziglang/static-base:llvm14-aarch64-3
2020
commands:
21-
- ./ci/drone/linux_script_test 1
21+
- ./ci/drone/test_linux_behavior
2222

23-
- name: test-2
23+
- name: std_Debug
2424
depends_on:
2525
- build
2626
image: ziglang/static-base:llvm14-aarch64-3
2727
commands:
28-
- ./ci/drone/linux_script_test 2
28+
- ./ci/drone/test_linux_std_Debug
2929

30-
- name: test-3
30+
- name: std_ReleaseSafe
3131
depends_on:
3232
- build
3333
image: ziglang/static-base:llvm14-aarch64-3
3434
commands:
35-
- ./ci/drone/linux_script_test 3
35+
- ./ci/drone/test_linux_std_ReleaseSafe
3636

37-
- name: test-4
37+
- name: std_ReleaseFast
3838
depends_on:
3939
- build
4040
image: ziglang/static-base:llvm14-aarch64-3
4141
commands:
42-
- ./ci/drone/linux_script_test 4
42+
- ./ci/drone/test_linux_std_ReleaseFast
4343

44-
- name: test-5
44+
- name: std_ReleaseSmall
4545
depends_on:
4646
- build
4747
image: ziglang/static-base:llvm14-aarch64-3
4848
commands:
49-
- ./ci/drone/linux_script_test 5
49+
- ./ci/drone/test_linux_std_ReleaseSmall
5050

51-
- name: test-6
51+
- name: misc
5252
depends_on:
5353
- build
5454
image: ziglang/static-base:llvm14-aarch64-3
5555
commands:
56-
- ./ci/drone/linux_script_test 6
56+
- ./ci/drone/test_linux_misc
5757

58-
- name: test-7
58+
- name: cases
5959
depends_on:
6060
- build
6161
image: ziglang/static-base:llvm14-aarch64-3
6262
commands:
63-
- ./ci/drone/linux_script_test 7
63+
- ./ci/drone/test_linux_cases
6464

6565
- name: finalize
6666
depends_on:
6767
- build
68-
- test-1
69-
- test-2
70-
- test-3
71-
- test-4
72-
- test-5
73-
- test-6
74-
- test-7
68+
- behavior
69+
- std_Debug
70+
- std_ReleaseSafe
71+
- std_ReleaseFast
72+
- std_ReleaseSmall
73+
- misc
74+
- cases
7575
image: ziglang/static-base:llvm14-aarch64-3
7676
environment:
7777
SRHT_OAUTH_TOKEN:

‎ci/drone/linux_script_build‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ git fetch --tags
4242
mkdir build
4343
cd build
4444
cmake .. \
45-
-DCMAKE_INSTALL_PREFIX="$DISTDIR" \
4645
-DCMAKE_PREFIX_PATH="$PREFIX" \
4746
-DCMAKE_BUILD_TYPE=Release \
4847
-DCMAKE_AR="$PREFIX/bin/ar" \
@@ -58,8 +57,11 @@ unset CC
5857
unset CXX
5958
samu install
6059

61-
# Here we rebuild Zig but this time using the Zig binary we just now produced to
62-
# build zig1.o rather than relying on the one built with stage0. See
63-
# https://github.com/ziglang/zig/issues/6830 for more details.
64-
cmake .. -DZIG_EXECUTABLE="$DISTDIR/bin/zig"
65-
samu install
60+
stage2/bin/zig build \
61+
--prefix "$DISTDIR" \
62+
--search-prefix "$PREFIX" \
63+
-Dstatic-llvm \
64+
-Drelease \
65+
-Dstrip \
66+
-Dtarget="$TARGET" \
67+
-Denable-stage1

‎ci/drone/linux_script_test‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎ci/drone/test_linux_behavior‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/sh
2+
3+
. ./ci/drone/linux_script_base
4+
5+
./build/zig build test-behavior -Dskip-non-native
6+
./build/zig build test-compiler-rt -Dskip-non-native
7+
./build/zig build test-fmt
8+
./build/zig build docs

‎ci/drone/test_linux_cases‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/sh
2+
3+
. ./ci/drone/linux_script_base
4+
5+
./build/zig build -Dskip-non-native # test building self-hosted without LLVM
6+
./build/zig build -Dskip-non-native test-cases

‎ci/drone/test_linux_misc‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/sh
2+
3+
. ./ci/drone/linux_script_base
4+
5+
./build/zig build test-universal-libc -Dskip-non-native
6+
./build/zig build test-compare-output -Dskip-non-native
7+
./build/zig build test-standalone -Dskip-non-native -Dskip-release-safe
8+
./build/zig build test-stack-traces -Dskip-non-native
9+
./build/zig build test-cli -Dskip-non-native
10+
./build/zig build test-asm-link -Dskip-non-native
11+
./build/zig build test-translate-c -Dskip-non-native

‎ci/drone/test_linux_std_Debug‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/sh
2+
3+
. ./ci/drone/linux_script_base
4+
5+
./build/zig build test-std -Dskip-release-safe -Dskip-release-fast -Dskip-release-small -Dskip-non-native

‎ci/drone/test_linux_std_ReleaseFast‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/sh
2+
3+
. ./ci/drone/linux_script_base
4+
5+
./build/zig build test-std -Dskip-debug -Dskip-release-safe -Dskip-release-small -Dskip-non-native -Dskip-single-threaded

‎ci/drone/test_linux_std_ReleaseSafe‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/sh
2+
3+
. ./ci/drone/linux_script_base
4+
5+
./build/zig build test-std -Dskip-debug -Dskip-release-fast -Dskip-release-small -Dskip-non-native -Dskip-single-threaded

‎ci/drone/test_linux_std_ReleaseSmall‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/sh
2+
3+
. ./ci/drone/linux_script_base
4+
5+
./build/zig build test-std -Dskip-debug -Dskip-release-safe -Dskip-release-fast -Dskip-non-native

0 commit comments

Comments
 (0)