Skip to content

Commit 400b2c9

Browse files
Loris CroLoris Cro
authored andcommitted
re-enable ci, bump up min zig version
previously config.h generation would collide when creating multiple variants of the same build, now the behavior has been fixed, allowing us to re-enable CI.
1 parent 21f9008 commit 400b2c9

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ jobs:
1515
- name: Setup Zig
1616
uses: mlugg/setup-zig@v2
1717

18-
- run: sudo apt-get install -y wine qemu-user
18+
- run: sudo apt-get install -y qemu-user
1919

2020
- run: zig build ci --summary all

build.zig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ pub fn build(b: *std.Build) void {
3939
b.installArtifact(dynlib);
4040
const test_step = b.step("test", "Run unit tests");
4141
test_step.dependOn(&run_test.step);
42-
// setupCi(b, target);
42+
setupCi(b, target);
4343
}
4444

4545
const CpuFeatures = struct {
@@ -963,15 +963,15 @@ pub fn setupCi(b: *std.Build, target: std.Build.ResolvedTarget) void {
963963
const native_lib, const native_dynlib, const run_native_test = buildOpus(b, target, .Debug, c);
964964
ci.dependOn(&b.addInstallArtifact(native_lib, .{}).step);
965965
ci.dependOn(&b.addInstallArtifact(native_dynlib, .{}).step);
966-
run_native_test.setName(b.fmt("native-test-config{}", .{idx}));
966+
run_native_test.setName(b.fmt("native-test-config #{} - {} ", .{ idx, c }));
967967
ci.dependOn(&run_native_test.step);
968968

969-
for (targets) |q| {
969+
for (targets, 0..) |q, qidx| {
970970
const rt = b.resolveTargetQuery(q);
971971
const lib, const dynlib, const run_test = buildOpus(b, rt, .Debug, c);
972972
ci.dependOn(&b.addInstallArtifact(lib, .{}).step);
973973
ci.dependOn(&b.addInstallArtifact(dynlib, .{}).step);
974-
run_test.setName(b.fmt("test-config{}", .{idx}));
974+
run_test.setName(b.fmt("test-config #{} - target # {} ", .{ idx, qidx }));
975975
run_test.failing_to_execute_foreign_is_an_error = false;
976976
ci.dependOn(&run_test.step);
977977
}

build.zig.zon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.{
22
.name = .opus,
33
.version = "0.0.2",
4-
.minimum_zig_version = "0.16.0-dev.1484+d0ba6642b",
4+
.minimum_zig_version = "0.16.0-dev.3061+9b1eaad13",
55
.fingerprint = 0x8db4fd2c707ee1be,
66
.dependencies = .{
77
.upstream = .{

0 commit comments

Comments
 (0)