mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: use zig build check-fmt instead of zig fmt --check

Browse Source 
We already have a zig build step for this: test-fmt.

* Rename the test-fmt step to check-fmt.
  test-fmt sounds like it runs tests for `zig fmt` itself (lib/std/zig/render.zig).
* Use it instead of `zig fmt --check` in the CI scripts.
* Also use it in CI scripts that didn't have this check before.
This commit is contained in:
Wooster 2023-08-29 23:10:36 +02:00 committed by Veikka Tuominen
parent f33bb0228b
commit 4d1432299f
5 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build.zig
View File

@ -422,13 +422,18 @@ pub fn build(b: *std.Build) !void {
const optimization_modes = chosen_opt_modes_buf[0..chosen_mode_index];
const fmt_include_paths = &.{ "doc", "lib", "src", "test", "tools", "build.zig" };
const fmt_exclude_paths = &.{"test/cases"};
const fmt_exclude_paths = &.{
"test/cases",
// This is for the CI scripts.
"build-debug",
"build-release",
};
const do_fmt = b.addFmt(.{
.paths = fmt_include_paths,
.exclude_paths = fmt_exclude_paths,
});
b.step("test-fmt", "Check source files having conforming formatting").dependOn(&b.addFmt(.{
b.step("check-fmt", "Check source files having conforming formatting").dependOn(&b.addFmt(.{
.paths = fmt_include_paths,
.exclude_paths = fmt_exclude_paths,
.check = true,

5
ci/aarch64-linux-debug.sh
View File

@ -50,11 +50,8 @@ unset CXX
ninja install
# TODO: move this to a build.zig step (check-fmt)
echo "Looking for non-conforming code formatting..."
stage3-debug/bin/zig fmt --check .. \
--exclude ../test/cases/ \
--exclude ../build-debug
stage3-debug/bin/zig build check-fmt
# simultaneously test building self-hosted without LLVM and with 32-bit arm
stage3-debug/bin/zig build \

5
ci/aarch64-linux-release.sh
View File

@ -50,11 +50,8 @@ unset CXX
ninja install
# TODO: move this to a build.zig step (check-fmt)
echo "Looking for non-conforming code formatting..."
stage3-release/bin/zig fmt --check .. \
--exclude ../test/cases/ \
--exclude ../build-release
stage3-release/bin/zig build check-fmt
# simultaneously test building self-hosted without LLVM and with 32-bit arm
stage3-release/bin/zig build \

5
ci/x86_64-linux-debug.sh
View File

@ -50,11 +50,8 @@ unset CXX
ninja install
# TODO: move this to a build.zig step (check-fmt)
echo "Looking for non-conforming code formatting..."
stage3-debug/bin/zig fmt --check .. \
--exclude ../test/cases/ \
--exclude ../build-debug
stage3-debug/bin/zig build check-fmt
# simultaneously test building self-hosted without LLVM and with 32-bit arm
stage3-debug/bin/zig build \

6
ci/x86_64-linux-release.sh
View File

@ -50,12 +50,8 @@ unset CXX
ninja install
# TODO: move this to a build.zig step (check-fmt)
echo "Looking for non-conforming code formatting..."
stage3-release/bin/zig fmt --check .. \
--exclude ../test/cases/ \
--exclude ../build-debug \
--exclude ../build-release
stage3-release/bin/zig build check-fmt
# simultaneously test building self-hosted without LLVM and with 32-bit arm
stage3-release/bin/zig build \