Skip to content

Commit

Permalink
Fixes fmt, aligns Makefile with CI/CD pipeline
Browse files Browse the repository at this point in the history
Buildkite failed on rust fmt step, this fixes that error.
Also aligns rust fmt call in our Makefile with the one used in buildkit.

- Call to fmt in our Makefile was
  - cargo +$(RUSTFMT_TOOLCHAIN) fmt

- Call in buildkite is
  - cargo +nightly-2024-04-22 fmt --all -- --check

- Call to fmt in our Makefile is now
  - cargo +$(RUSTFMT_TOOLCHAIN) fmt --all -- --check

Signed-off-by: Jason Heath <[email protected]>
  • Loading branch information
jasonheath committed Sep 20, 2024
1 parent 7162f15 commit 2c7784d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ $(foreach component,$(ALL),$(eval $(call CLEAN,$(component))))
RUSTFMT_TOOLCHAIN := $(shell cat RUSTFMT_VERSION)
define FMT
fmt-$1: image ## formats the $1 component
$(run) sh -c 'cd components/$1 && cargo +$(RUSTFMT_TOOLCHAIN) fmt'
$(run) sh -c 'cd components/$1 && cargo +$(RUSTFMT_TOOLCHAIN) fmt --all -- --check'
.PHONY: fmt-$1

endef
Expand Down
1 change: 0 additions & 1 deletion components/core/src/util/posix_perm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ mod tests {

#[test]
fn exercise_set_umask_0022() {

// From `man 2 umask` on a Linux box.
//
// RETURN VALUE
Expand Down

0 comments on commit 2c7784d

Please sign in to comment.