Skip to content

Commit c3c467d

Browse files
committed
Fix addlicense and cargo format checks
Signed-off-by: Martijn Stevenson <[email protected]>
1 parent ed21050 commit c3c467d

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

.github/workflows/format.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
echo "$(go env GOPATH)/bin" >> "$GITHUB_PATH"
5757
5858
- name: Format (addlicense)
59-
run: addlicense -check .
59+
run: addlicense -ignore "bazel/cargo/*/remote/**" -check .
6060

6161
buildifier:
6262
name: check format with buildifier
@@ -78,8 +78,8 @@ jobs:
7878
- name: Format (buildifier)
7979
run: find . -name "WORKSPACE" -o -name "*BUILD*" -o -name "*.bzl" | xargs -n1 buildifier -mode=check
8080

81-
cargo_raze:
82-
name: check format with cargo-raze
81+
rules_rust:
82+
name: check format with rules_rust
8383

8484
runs-on: ubuntu-latest
8585

@@ -93,14 +93,11 @@ jobs:
9393
run: |
9494
bazel query 'deps(//bazel/cargo/...)'
9595
96-
- name: Format (cargo raze)
97-
working-directory: bazel/cargo
96+
- name: Format (rules_rust)
9897
run: |
99-
cd wasmsign && cargo raze && cd ..
100-
cd wasmtime && cargo raze && cd ..
101-
# Ignore manual changes in "errno" and "rustix" crates until fixed in cargo-raze.
102-
# See: https://github.com/google/cargo-raze/issues/451
103-
git diff --exit-code -- ':!wasmtime/remote/BUILD.errno-0.*.bazel' ':!wasmtime/remote/BUILD.rustix-0.*.bazel'
98+
bazel run //bazel/cargo/wasmsign:crates_vendor
99+
bazel run //bazel/cargo/wasmtime:crates_vendor
100+
git diff --exit-code
104101
105102
clang_format:
106103
name: check format with clang-format

0 commit comments

Comments
 (0)