Skip to content

Commit 8b9a1a3

Browse files
committed
Include repo-tweak checks in rustfmt job; update patch logic
1 parent 36a359b commit 8b9a1a3

File tree

3 files changed

+29
-3
lines changed

3 files changed

+29
-3
lines changed

.github/other/patch-prebuilt.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@ if [[ "$version" == "nightly" ]]; then
1414
# Do not use extraFeatures="api-custom" here. They just want to use nightly Godot with current API.
1515
extraFeatures=""
1616
else
17-
# Extract "major.minor" from "major.minor[.patch]".
18-
dashedVersion=$(echo "$version" | cut -d '.' -f 1,2 | sed 's/\./-/')
17+
# Extract "major.minor" from "major.minor[.patch]" -- disabled.
18+
# dashedVersion=$(echo "$version" | cut -d '.' -f 1,2 | sed 's/\./-/')
19+
20+
# Convert . to - for feature name.
21+
dashedVersion="${version//./-}"
1922
extraFeatures=", \"api-$dashedVersion\""
2023
fi
2124

.github/workflows/full-ci.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,18 @@ jobs:
4848
- name: "Check rustfmt"
4949
run: cargo fmt --all -- --check
5050

51+
- name: "Run custom repo checks"
52+
run: |
53+
cargo run -p repo-tweak
54+
git diff --quiet --exit-code || {
55+
echo "::error::Godot versions out of sync; update with `cargo run -p repo-tweak`."
56+
echo "Differences:"
57+
echo "----------------------------------------------------"
58+
git diff
59+
echo "----------------------------------------------------"
60+
exit 1
61+
}
62+
5163
5264
# Needs to be its own job (apart from sync-doc), because lints don't work with --no-deps, and because it contributes to ci-status.
5365
doc-lints:
@@ -362,7 +374,7 @@ jobs:
362374
os: ubuntu-20.04
363375
artifact-name: linux-memcheck-4.1
364376
godot-binary: godot.linuxbsd.editor.dev.x86_64.llvm.san
365-
godot-prebuilt-patch: '4.1.4'
377+
godot-prebuilt-patch: '4.1' # check compat of API 4.1.0 with newer binaries.
366378
rust-toolchain: nightly
367379
rust-env-rustflags: -Zrandomize-layout -Zsanitizer=address
368380
# Sanitizers can't build proc-macros and build scripts; with --target, cargo ignores RUSTFLAGS for those two.

.github/workflows/minimal-ci.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,17 @@ jobs:
5252
- name: "Check rustfmt"
5353
run: cargo fmt --all -- --check
5454

55+
- name: "Run custom repo checks"
56+
run: |
57+
cargo run -p repo-tweak
58+
git diff --quiet --exit-code || {
59+
echo "::error::Godot versions out of sync; update with `cargo run -p repo-tweak`."
60+
echo "Differences:"
61+
echo "----------------------------------------------------"
62+
git diff
63+
echo "----------------------------------------------------"
64+
exit 1
65+
}
5566
5667
# Needs to be its own job (apart from sync-doc), because lints don't work with --no-deps, and because it contributes to ci-status.
5768
doc-lints:

0 commit comments

Comments
 (0)