Skip to content

Commit 9c31a17

Browse files
committed
Refactor ci and testing
Add luajit to test coverage. Remove cross compilation coverage because it was commented out (can reconsider this in the future). Tests only target Zig 0.16.0.
1 parent 0341f3e commit 9c31a17

2 files changed

Lines changed: 4 additions & 74 deletions

File tree

.github/workflows/tests.yml

Lines changed: 2 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ on:
77
branches: [ "main" ]
88

99
jobs:
10-
#------ zig-dev builds ------
11-
test_zig_nightly:
10+
test_zig:
1211
strategy:
1312
matrix:
1413
os: [ubuntu-latest, macos-latest, windows-latest, ubuntu-24.04-arm]
@@ -25,44 +24,5 @@ jobs:
2524
version: "0.16.0"
2625

2726
- name: Run tests
28-
run: make test_zig_nightly
27+
run: make test
2928

30-
#------ zig-0.15 ------
31-
#test_zig_015:
32-
# strategy:
33-
# matrix:
34-
# os: [ubuntu-latest, macos-latest, windows-latest, ubuntu-24.04-arm]
35-
36-
# runs-on: ${{matrix.os}}
37-
38-
# steps:
39-
# - name: Clone Ziglua
40-
# uses: actions/checkout@v3
41-
42-
# - name: Setup Zig
43-
# uses: mlugg/setup-zig@v2
44-
# with:
45-
# version: "0.15.2"
46-
47-
# - name: Run tests
48-
# run: make test_zig_stable
49-
50-
#------ cross compilation ------
51-
test_cross:
52-
strategy:
53-
matrix:
54-
os: [ubuntu-latest, macos-latest, windows-latest, ubuntu-24.04-arm]
55-
56-
runs-on: ${{matrix.os}}
57-
58-
steps:
59-
- name: Clone Ziglua
60-
uses: actions/checkout@v3
61-
62-
- name: Setup Zig
63-
uses: mlugg/setup-zig@v2
64-
with:
65-
version: "0.16.0"
66-
67-
- name: Run tests
68-
run: make test_cross

makefile

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,18 @@
11
.PHONY: test docs
22

3-
test_zig_nightly:
4-
# FIXME: reenable after resolution of https://codeberg.org/ziglang/translate-c/issues/282
5-
# zig build test --summary failures -Dlang=lua51
6-
zig build test --summary failures -Dlang=lua52
7-
zig build test --summary failures -Dlang=lua53
8-
zig build test --summary failures -Dlang=lua54
9-
zig build test --summary failures -Dlang=lua55
10-
zig build test --summary failures -Dlang=luau
11-
12-
zig build install-example-interpreter
13-
zig build install-example-zig-function
14-
zig build -Dlang=luau install-example-luau-bytecode
15-
16-
# FIXME: reenable after resolution of https://codeberg.org/ziglang/translate-c/issues/282
17-
# zig build -Dlang=luajit
18-
193
# A subset of tests that are expected to work also on stable builds of zig
20-
test_zig_stable:
4+
test:
215
zig build test --summary failures -Dlang=lua51
226
zig build test --summary failures -Dlang=lua52
237
zig build test --summary failures -Dlang=lua53
248
zig build test --summary failures -Dlang=lua54
259
zig build test --summary failures -Dlang=lua55
2610
zig build test --summary failures -Dlang=luau
11+
zig build test --summary failures -Dlang=luajit
2712

2813
zig build install-example-interpreter
2914
zig build install-example-zig-function
3015
zig build -Dlang=luau install-example-luau-bytecode
3116

32-
test_cross:
33-
# TODO: audit this; is it expected that cross-compilation should be an issue?
34-
# FIXME: reenable after resolution of https://codeberg.org/ziglang/translate-c/issues/282
35-
# zig build -Dlang=lua51 -Dtarget=aarch64-linux
36-
# zig build -Dlang=lua51 -Dtarget=aarch64-linux-gnu
37-
# zig build -Dlang=luajit -Dtarget=aarch64-linux
38-
# zig build -Dlang=luajit -Dtarget=aarch64-linux-gnu
39-
#
40-
# zig build -Dlang=lua51 -Dtarget=x86_64-linux
41-
# zig build -Dlang=lua51 -Dtarget=x86_64-linux-gnu
42-
# zig build -Dlang=luajit -Dtarget=x86_64-linux
43-
# zig build -Dlang=luajit -Dtarget=x86_64-linux-gnu
44-
#
45-
# zig build -Dlang=luajit -Dtarget=aarch64-macos
46-
4717
docs:
4818
zig build docs

0 commit comments

Comments
 (0)