Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to latest zig + fix zig build test first pass #29

Merged
merged 2 commits into from
Dec 28, 2023
Merged

Update to latest zig + fix zig build test first pass #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e88c92
Update to zig-0.12.0-dev.1856+94c63f31f
Arwalk Dec 28, 2023
e3d42d2
fixed test building dependency
Arwalk Dec 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 4 additions & 3 deletions build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading