Skip to content

Commit 0763d73

Browse files
authored
Merge pull request #1074 from godot-rust/qol/tools
Tooling updates
2 parents 7e55836 + 8516ff0 commit 0763d73

File tree

40 files changed

+108
-164
lines changed

40 files changed

+108
-164
lines changed

.github/composite/godot/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ inputs:
2020
runs:
2121
using: "composite"
2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424
- name: Install Rust
2525
uses: ./.github/composite/rust
2626
with:
2727
rust: ${{ inputs.rust_toolchain }}
2828
- name: "Check cache for installed Godot version"
2929
id: "cache-godot"
30-
uses: actions/cache@v3
30+
uses: actions/cache@v4
3131
with:
3232
path: ${{ runner.temp }}/godot_bin
3333
key: godot-${{ runner.os }}-v${{ inputs.godot_ver }}

.github/composite/llvm/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ runs:
1414
id: cache-llvm
1515
# Note: conditionals not yet supported; see https://github.com/actions/runner/issues/834
1616
# if: ${{ inputs.llvm == 'true' }}
17-
uses: actions/cache@v3
17+
uses: actions/cache@v4
1818
with:
1919
path: ${{ runner.temp }}/llvm
2020
key: llvm-10.0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
MTFBQUZNN0NBMHVoSTJTeUk2OEptdl9Ea1pzdTlEbWZtUHRTdldzVnJDT0dibnA2Z2FZNk9OaHoxeEdObnpMMGx6UTVVRTJNM0Ezdjk3RXJjTAo=
1+
MTFBQUZNN0NBMGZzSGFaOVJFSmRtdV9IYnJXVEFZVEoxNDJ3N3VPTG1UY3UyTnlQM1h2RXNoMjZTMmNtdEhLa2hOQlFOVllWTVlhSTE1bk1JUwo=

.github/workflows/full-ci.yml

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ env:
2828
# Local variables
2929
# Note: using variables is limited at the moment, see https://github.com/actions/runner/issues/480
3030
GDRUST_FEATURES: "gdnative/async,gdnative/serde,gdnative_bindings_generator/debug"
31-
CARGO_DENY_VERSION: "0.11.4"
32-
CARGO_DINGHY_VERSION: "0.6.4"
33-
CARGO_MACHETE_VERSION: "0.3"
31+
CARGO_DENY_VERSION: "0.14.20"
32+
CARGO_DINGHY_VERSION: "0.6.8"
33+
CARGO_MACHETE_VERSION: "0.6.2"
3434

3535
on:
3636
merge_group:
@@ -43,7 +43,7 @@ jobs:
4343
rustfmt:
4444
runs-on: ubuntu-latest
4545
steps:
46-
- uses: actions/checkout@v3
46+
- uses: actions/checkout@v4
4747
- name: "Install Rust"
4848
uses: ./.github/composite/rust
4949
with:
@@ -64,7 +64,7 @@ jobs:
6464
- toolchain: nightly
6565
postfix: ' (nightly)'
6666
steps:
67-
- uses: actions/checkout@v3
67+
- uses: actions/checkout@v4
6868
- name: "Install Rust"
6969
uses: ./.github/composite/rust
7070
with:
@@ -77,7 +77,7 @@ jobs:
7777
runs-on: ubuntu-latest
7878
needs: rustfmt
7979
steps:
80-
- uses: actions/checkout@v3
80+
- uses: actions/checkout@v4
8181

8282
# Deny
8383
# Note: manually downloading is ~30s faster than https://github.com/EmbarkStudios/cargo-deny-action
@@ -127,22 +127,17 @@ jobs:
127127
- rust: { toolchain: 'nightly' }
128128
testflags: '-- --skip ui_tests'
129129
- os: { id: ubuntu-latest, name: linux }
130-
rust: { toolchain: '1.67', postfix: ' (msrv 1.67)' }
130+
rust: { toolchain: '1.70', postfix: ' (msrv 1.70)' }
131131
testflags: '-- --skip ui_tests'
132132
- os: { id: ubuntu-latest, name: linux }
133133
rust: { toolchain: 'stable', postfix: ' (minimal-deps)', special: 'minimal-deps' }
134134
testflags: '-- --skip ui_tests'
135135
runs-on: ${{ matrix.os.id }}
136136
steps:
137-
- uses: actions/checkout@v3
137+
- uses: actions/checkout@v4
138138
- name: "Install nightly Rust (minimal-deps only)"
139-
uses: actions-rs/toolchain@v1
140-
with:
141-
profile: minimal
142-
toolchain: nightly
143-
override: false # use selected toolchain for remainder of this step
144-
components: cargo
145139
if: ${{ matrix.rust.special == 'minimal-deps' }}
140+
run: rustup toolchain install nightly --profile minimal --component cargo
146141
- name: "Install minimal dependency versions from Cargo"
147142
run: cargo +nightly update -Z minimal-versions
148143
if: ${{ matrix.rust.special == 'minimal-deps' }}
@@ -174,7 +169,7 @@ jobs:
174169
name: linux
175170
runs-on: ${{ matrix.os.id }}
176171
steps:
177-
- uses: actions/checkout@v3
172+
- uses: actions/checkout@v4
178173
- name: "Install Rust"
179174
uses: ./.github/composite/rust
180175
with:
@@ -193,7 +188,7 @@ jobs:
193188
# rust: [stable]
194189
runs-on: macos-latest
195190
steps:
196-
- uses: actions/checkout@v3
191+
- uses: actions/checkout@v4
197192
- name: "Install Rust"
198193
uses: ./.github/composite/rust
199194
#with:
@@ -225,7 +220,7 @@ jobs:
225220
# rust: [stable]
226221
runs-on: ubuntu-latest
227222
steps:
228-
- uses: actions/checkout@v3
223+
- uses: actions/checkout@v4
229224
- name: "Install Rust"
230225
uses: ./.github/composite/rust
231226
#with:
@@ -295,16 +290,16 @@ jobs:
295290
godot: "3.5.1-stable"
296291
postfix: ' (nightly, inventory)'
297292
build_args: '--features inventory'
298-
- rust: '1.67'
293+
- rust: '1.70'
299294
godot: "3.5.1-stable"
300-
postfix: ' (msrv 1.67)'
301-
- rust: '1.67'
295+
postfix: ' (msrv 1.70)'
296+
- rust: '1.70'
302297
godot: "3.5.1-stable"
303-
postfix: ' (msrv 1.67, ptrcall)'
298+
postfix: ' (msrv 1.70, ptrcall)'
304299
build_args: '--features ptrcall'
305-
- rust: '1.67'
300+
- rust: '1.70'
306301
godot: "3.5.1-stable"
307-
postfix: ' (msrv 1.67, inventory)'
302+
postfix: ' (msrv 1.70, inventory)'
308303
build_args: '--features inventory'
309304

310305
# Test with oldest supported engine version
@@ -318,7 +313,7 @@ jobs:
318313
build_args: '--features custom-godot,ptrcall'
319314
runs-on: ubuntu-latest
320315
steps:
321-
- uses: actions/checkout@v3
316+
- uses: actions/checkout@v4
322317
- name: "Run Godot integration test"
323318
uses: ./.github/composite/godot
324319
with:

.github/workflows/minimal-ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
rustfmt:
3333
runs-on: ubuntu-latest
3434
steps:
35-
- uses: actions/checkout@v3
35+
- uses: actions/checkout@v4
3636
- name: "Install Rust"
3737
uses: ./.github/composite/rust
3838
with:
@@ -45,7 +45,7 @@ jobs:
4545
runs-on: ubuntu-latest
4646
continue-on-error: ${{ matrix.rust == 'nightly' }}
4747
steps:
48-
- uses: actions/checkout@v3
48+
- uses: actions/checkout@v4
4949
- name: "Install Rust"
5050
uses: ./.github/composite/rust
5151
with:
@@ -57,7 +57,7 @@ jobs:
5757
check-todo:
5858
runs-on: ubuntu-latest
5959
steps:
60-
- uses: actions/checkout@v3
60+
- uses: actions/checkout@v4
6161
- name: "Install ripgrep"
6262
run: |
6363
cd /tmp
@@ -70,7 +70,7 @@ jobs:
7070
unit-test:
7171
runs-on: ubuntu-latest
7272
steps:
73-
- uses: actions/checkout@v3
73+
- uses: actions/checkout@v4
7474
- name: "Install Rust"
7575
uses: ./.github/composite/rust
7676
- name: "Compile tests"
@@ -81,7 +81,7 @@ jobs:
8181
integration-test-godot:
8282
runs-on: ubuntu-latest
8383
steps:
84-
- uses: actions/checkout@v3
84+
- uses: actions/checkout@v4
8585
- name: "Run Godot integration test"
8686
uses: ./.github/composite/godot
8787
with:

.github/workflows/release-version.yml

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
validation:
3131
runs-on: ubuntu-latest
3232
steps:
33-
- uses: actions/checkout@v3
33+
- uses: actions/checkout@v4
3434

3535
# sed: https://unix.stackexchange.com/a/589584
3636
- name: "Interpret tag version"
@@ -73,12 +73,11 @@ jobs:
7373
runs-on: ubuntu-latest
7474
needs: validation
7575
steps:
76-
- uses: actions/checkout@v3
77-
- uses: actions-rs/toolchain@v1
78-
with:
79-
profile: minimal
80-
toolchain: stable
81-
override: true
76+
- uses: actions/checkout@v4
77+
- name: "Install Rust toolchain"
78+
run: |
79+
rustup toolchain install stable --profile minimal
80+
rustup default stable
8281
- name: "Compile tests"
8382
run: cargo test --workspace --features ${GDRUST_FEATURES} --no-run
8483
- name: "Test"
@@ -88,27 +87,23 @@ jobs:
8887
runs-on: ubuntu-latest
8988
needs: validation
9089
steps:
91-
- uses: actions/checkout@v3
92-
- uses: actions-rs/toolchain@v1
93-
with:
94-
profile: minimal
95-
toolchain: stable
96-
override: true
97-
components: clippy
90+
- uses: actions/checkout@v4
91+
- name: "Install Rust toolchain"
92+
run: |
93+
rustup toolchain install stable --profile minimal --component clippy
94+
rustup default stable
9895
- name: "Check clippy"
9996
run: cargo clippy --workspace --features ${GDRUST_FEATURES} -- -D clippy::style -D clippy::complexity -D clippy::perf -D clippy::dbg_macro -D clippy::todo -D clippy::unimplemented
10097

10198
rustfmt:
10299
runs-on: ubuntu-latest
103100
needs: validation
104101
steps:
105-
- uses: actions/checkout@v3
106-
- uses: actions-rs/toolchain@v1
107-
with:
108-
profile: minimal
109-
toolchain: stable
110-
override: true
111-
components: rustfmt
102+
- uses: actions/checkout@v4
103+
- name: "Install Rust toolchain"
104+
run: |
105+
rustup toolchain install stable --profile minimal --component rustfmt
106+
rustup default stable
112107
- name: "Check rustfmt"
113108
run: cargo fmt --all -- --check
114109

@@ -119,7 +114,7 @@ jobs:
119114
steps:
120115
# Note: we cannot dry-run the publishing, since crates depend on each other, and dry-run will fail if they aren't yet on crates.io.
121116
# Sleep to leave crates.io and docs.rs some time to index the dependencies, before releasing dependents.
122-
- uses: actions/checkout@v3
117+
- uses: actions/checkout@v4
123118
- name: "Execute crates.io publishing"
124119
env:
125120
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_TOKEN }}

.github/workflows/update-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
steps:
2424
# Checkout is always needed, for the notify step
2525
- name: "Checkout"
26-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
2727

2828
# This is just a sanity check to make sure that the follow-up docs generation doesn't break.
2929
# So we use the Rust version provided by the GitHub runners, which hopefully is >= MSRV.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ If you are looking to contribute, but are not sure if what you want to do falls
2222

2323
## Toolchain compatibility
2424

25-
`gdnative` currently has a minimum supported Rust version (MSRV) of **1.67**. We use the Rust 2021 Edition.
25+
`gdnative` currently has a minimum supported Rust version (MSRV) of **1.70**. We use the Rust 2021 Edition.
2626

2727
> **Warning**: **Linux users: Be aware of the source of your Godot binary!** Binary distributions of Godot using a container-based format may ship versions of dependencies that may not be compatible with GDNative libraries built directly from your base system. Examples of such formats include **Flatpak**, **Snap**, and **AppImage**.
2828
>

bindings-generator/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ license = "MIT"
99
version = "0.11.3"
1010
workspace = ".."
1111
edition = "2021"
12-
rust-version = "1.67"
12+
rust-version = "1.70"
1313

1414
[features]
1515
debug = []
@@ -23,6 +23,6 @@ proc-macro2 = "1"
2323
quote = "1"
2424
regex = { version = "1.5.5", default-features = false, features = ["std", "unicode-perl"] } # for security: https://blog.rust-lang.org/2022/03/08/cve-2022-24713.html
2525
roxmltree = "0.19"
26-
syn = { version = "1", features = ["full", "extra-traits", "visit"] }
26+
syn = { version = "1.0.84", features = ["full", "extra-traits", "visit"] }
2727
unindent = "0.2.0"
2828
which = { optional = true, version = "5" }

bindings-generator/src/methods.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ pub fn generate_method_table(api: &Api, class: &GodotClass) -> TokenStream {
224224
#(#impl_methods),*
225225
};
226226

227+
#[allow(static_mut_refs)]
227228
&mut TABLE
228229
}
229230

examples/builder-export/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "builder-export"
33
version = "0.1.0"
44
authors = ["The godot-rust developers"]
55
edition = "2021"
6-
rust-version = "1.67"
6+
rust-version = "1.70"
77
license = "MIT"
88
publish = false
99

examples/dodge-the-creeps/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.1.0"
44
authors = ["The godot-rust developers"]
55
publish = false
66
edition = "2021"
7-
rust-version = "1.67"
7+
rust-version = "1.70"
88
license = "MIT"
99

1010
[lib]

examples/godot_tps_controller_port/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.1.0"
44
edition = "2021"
55
authors = ["The godot-rust developers"]
66
publish = false
7-
rust-version = "1.67"
7+
rust-version = "1.70"
88
license = "MIT"
99

1010
[dependencies]

examples/hello-world/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.1.0"
44
authors = ["The godot-rust developers"]
55
publish = false
66
edition = "2021"
7-
rust-version = "1.67"
7+
rust-version = "1.70"
88
license = "MIT"
99

1010
[lib]

examples/native-plugin/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "native-plugin"
33
version = "0.1.0"
44
authors = ["The godot-rust developers"]
55
edition = "2021"
6-
rust-version = "1.67"
6+
rust-version = "1.70"
77
license = "MIT"
88
publish = false
99

examples/property-export/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "property-export"
33
version = "0.1.0"
44
authors = ["The godot-rust developers"]
55
edition = "2021"
6-
rust-version = "1.67"
6+
rust-version = "1.70"
77
license = "MIT"
88
publish = false
99

examples/resource/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.1.0"
44
authors = ["The godot-rust developers"]
55
publish = false
66
edition = "2021"
7-
rust-version = "1.67"
7+
rust-version = "1.70"
88
license = "MIT"
99

1010
[lib]

examples/rpc/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.1.0"
44
authors = ["The godot-rust developers"]
55
publish = false
66
edition = "2021"
7-
rust-version = "1.67"
7+
rust-version = "1.70"
88
license = "MIT"
99

1010
[lib]

examples/scene-create/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.1.0"
44
authors = ["The godot-rust developers"]
55
publish = false
66
edition = "2021"
7-
rust-version = "1.67"
7+
rust-version = "1.70"
88
license = "MIT"
99

1010
[lib]

0 commit comments

Comments
 (0)