mirror of
https://github.com/ziglang/zig.git
synced 2025-12-06 06:13:07 +00:00
Revert "ci: use zig build check-fmt instead of zig fmt --check"
This reverts commit 4d1432299fe5dccef1e8254800e365c4d6c0d435. Please don't hard-code unrelated concerns this way. build.zig should not have awareness of the naming conventions for cmake build directories.
This commit is contained in:
parent
5b7eefce46
commit
7e2b6b0f1b
@ -422,18 +422,13 @@ pub fn build(b: *std.Build) !void {
|
|||||||
const optimization_modes = chosen_opt_modes_buf[0..chosen_mode_index];
|
const optimization_modes = chosen_opt_modes_buf[0..chosen_mode_index];
|
||||||
|
|
||||||
const fmt_include_paths = &.{ "doc", "lib", "src", "test", "tools", "build.zig" };
|
const fmt_include_paths = &.{ "doc", "lib", "src", "test", "tools", "build.zig" };
|
||||||
const fmt_exclude_paths = &.{
|
const fmt_exclude_paths = &.{"test/cases"};
|
||||||
"test/cases",
|
|
||||||
// This is for the CI scripts.
|
|
||||||
"build-debug",
|
|
||||||
"build-release",
|
|
||||||
};
|
|
||||||
const do_fmt = b.addFmt(.{
|
const do_fmt = b.addFmt(.{
|
||||||
.paths = fmt_include_paths,
|
.paths = fmt_include_paths,
|
||||||
.exclude_paths = fmt_exclude_paths,
|
.exclude_paths = fmt_exclude_paths,
|
||||||
});
|
});
|
||||||
|
|
||||||
b.step("check-fmt", "Check source files having conforming formatting").dependOn(&b.addFmt(.{
|
b.step("test-fmt", "Check source files having conforming formatting").dependOn(&b.addFmt(.{
|
||||||
.paths = fmt_include_paths,
|
.paths = fmt_include_paths,
|
||||||
.exclude_paths = fmt_exclude_paths,
|
.exclude_paths = fmt_exclude_paths,
|
||||||
.check = true,
|
.check = true,
|
||||||
|
|||||||
@ -50,8 +50,11 @@ unset CXX
|
|||||||
|
|
||||||
ninja install
|
ninja install
|
||||||
|
|
||||||
|
# TODO: move this to a build.zig step (check-fmt)
|
||||||
echo "Looking for non-conforming code formatting..."
|
echo "Looking for non-conforming code formatting..."
|
||||||
stage3-debug/bin/zig build check-fmt
|
stage3-debug/bin/zig fmt --check .. \
|
||||||
|
--exclude ../test/cases/ \
|
||||||
|
--exclude ../build-debug
|
||||||
|
|
||||||
# simultaneously test building self-hosted without LLVM and with 32-bit arm
|
# simultaneously test building self-hosted without LLVM and with 32-bit arm
|
||||||
stage3-debug/bin/zig build \
|
stage3-debug/bin/zig build \
|
||||||
|
|||||||
@ -50,8 +50,11 @@ unset CXX
|
|||||||
|
|
||||||
ninja install
|
ninja install
|
||||||
|
|
||||||
|
# TODO: move this to a build.zig step (check-fmt)
|
||||||
echo "Looking for non-conforming code formatting..."
|
echo "Looking for non-conforming code formatting..."
|
||||||
stage3-release/bin/zig build check-fmt
|
stage3-release/bin/zig fmt --check .. \
|
||||||
|
--exclude ../test/cases/ \
|
||||||
|
--exclude ../build-release
|
||||||
|
|
||||||
# simultaneously test building self-hosted without LLVM and with 32-bit arm
|
# simultaneously test building self-hosted without LLVM and with 32-bit arm
|
||||||
stage3-release/bin/zig build \
|
stage3-release/bin/zig build \
|
||||||
|
|||||||
@ -50,8 +50,11 @@ unset CXX
|
|||||||
|
|
||||||
ninja install
|
ninja install
|
||||||
|
|
||||||
|
# TODO: move this to a build.zig step (check-fmt)
|
||||||
echo "Looking for non-conforming code formatting..."
|
echo "Looking for non-conforming code formatting..."
|
||||||
stage3-debug/bin/zig build check-fmt
|
stage3-debug/bin/zig fmt --check .. \
|
||||||
|
--exclude ../test/cases/ \
|
||||||
|
--exclude ../build-debug
|
||||||
|
|
||||||
# simultaneously test building self-hosted without LLVM and with 32-bit arm
|
# simultaneously test building self-hosted without LLVM and with 32-bit arm
|
||||||
stage3-debug/bin/zig build \
|
stage3-debug/bin/zig build \
|
||||||
|
|||||||
@ -50,8 +50,12 @@ unset CXX
|
|||||||
|
|
||||||
ninja install
|
ninja install
|
||||||
|
|
||||||
|
# TODO: move this to a build.zig step (check-fmt)
|
||||||
echo "Looking for non-conforming code formatting..."
|
echo "Looking for non-conforming code formatting..."
|
||||||
stage3-release/bin/zig build check-fmt
|
stage3-release/bin/zig fmt --check .. \
|
||||||
|
--exclude ../test/cases/ \
|
||||||
|
--exclude ../build-debug \
|
||||||
|
--exclude ../build-release
|
||||||
|
|
||||||
# simultaneously test building self-hosted without LLVM and with 32-bit arm
|
# simultaneously test building self-hosted without LLVM and with 32-bit arm
|
||||||
stage3-release/bin/zig build \
|
stage3-release/bin/zig build \
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user