From 4e88c9292c002c75f1b4c96d00bd3ff7e32f4515 Mon Sep 17 00:00:00 2001 From: Arwalk Date: Thu, 28 Dec 2023 08:48:52 +0100 Subject: [PATCH 1/2] Update to zig-0.12.0-dev.1856+94c63f31f Nothing changed in particular, but it shows it builds properly. --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 631ad39..de6c2eb 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -3,6 +3,6 @@ RUN git config --global core.autocrlf input ADD . . -RUN bash ./install-zig.sh 0.12.0-dev.1695+e4977f3e8 +RUN bash ./install-zig.sh 0.12.0-dev.1856+94c63f31f ENV AGREE=true From e3d42d2deafa573dd7c47930a434716bb4f1925c Mon Sep 17 00:00:00 2001 From: Arwalk Date: Thu, 28 Dec 2023 09:42:59 +0100 Subject: [PATCH 2/2] fixed test building dependency Some tests depended on the generation of the `generated_in_ci.zig` file, but the dependency was set on the "running the test" step, not on "compiling the test", making it fail on a first pass. --- build.zig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build.zig b/build.zig index cdef984..bec16bd 100644 --- a/build.zig +++ b/build.zig @@ -113,10 +113,11 @@ pub fn build(b: *std.build.Builder) !void { // and can be selected like this: `zig build test` // This will evaluate the `test` step rather than the default, which is "install". const run_main_tests = b.addRunArtifact(test_item); - test_step.dependOn(&run_main_tests.step); - test_step.dependOn(&convertStep.step); - test_step.dependOn(&convertStep2.step); + test_item.step.dependOn(&convertStep.step); + test_item.step.dependOn(&convertStep2.step); + + test_step.dependOn(&run_main_tests.step); } const wd = try getProtocInstallDir(std.heap.page_allocator, PROTOC_VERSION);