Skip to content

Commit bab1070

Browse files
bors[bot]Bromeon
andauthored
Merge #244
244: Update MSRV to 1.66; fix detection in CI r=Bromeon a=Bromeon The unit-test job accidentally used the nightly compiler in MSRV check. Now, `minimal-deps` and `msrv` are two separate jobs. MSRV 1.63 was incorrect -- two features require newer Rust versions: 1. discriminants on enums with fields (for `*Notification` types) https://blog.rust-lang.org/2022/12/15/Rust-1.66.0.html#explicit-discriminants-on-enums-with-fields 2. let-else https://blog.rust-lang.org/2022/11/03/Rust-1.65.0.html#let-else-statements Co-authored-by: Jan Haller <[email protected]>
2 parents d3a6236 + d1dac02 commit bab1070

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

.github/workflows/full-ci.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,14 @@ jobs:
8686

8787
- name: linux
8888
os: ubuntu-20.04
89-
rust-toolchain: '1.63.0'
89+
rust-toolchain: nightly
9090
rust-special: -minimal-deps
91+
rust-cache-key: minimal-deps
92+
93+
- name: linux
94+
os: ubuntu-20.04
95+
rust-toolchain: '1.66.0'
96+
rust-special: -msrv
9197

9298
steps:
9399
- uses: actions/checkout@v3
@@ -96,14 +102,7 @@ jobs:
96102
uses: ./.github/composite/rust
97103
with:
98104
rust: ${{ matrix.rust-toolchain || 'stable' }}
99-
cache-key: ${{ matrix.rust-special }} # '-minimal-deps' or empty/not defined
100-
101-
- name: "Install Rust nightly (minimal deps)"
102-
if: matrix.rust-special == '-minimal-deps'
103-
uses: ./.github/composite/rust
104-
with:
105-
rust: nightly
106-
cache-key: minimal-deps-nightly
105+
cache-key: ${{ matrix.rust-cache-key }} # only needed when rustc version is possibly the same
107106

108107
- name: "Install minimal dependency versions from Cargo"
109108
if: matrix.rust-special == '-minimal-deps'
@@ -196,6 +195,7 @@ jobs:
196195
rust-toolchain: nightly
197196
rust-env-rustflags: -Zrandomize-layout
198197

198+
199199
steps:
200200
- uses: actions/checkout@v3
201201

godot-bindings/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "godot-bindings"
33
version = "0.1.0"
44
edition = "2021"
5-
rust-version = "1.63"
5+
rust-version = "1.66"
66
license = "MPL-2.0"
77
keywords = ["gamedev", "godot", "engine", "ffi", "sys"]
88
categories = ["game-engines", "graphics"]

godot-codegen/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "godot-codegen"
33
version = "0.1.0"
44
edition = "2021"
5-
rust-version = "1.63"
5+
rust-version = "1.66"
66
license = "MPL-2.0"
77
keywords = ["gamedev", "godot", "engine", "codegen"]
88
categories = ["game-engines", "graphics"]

godot-core/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "godot-core"
33
version = "0.1.0"
44
edition = "2021"
5-
rust-version = "1.63"
5+
rust-version = "1.66"
66
license = "MPL-2.0"
77
keywords = ["gamedev", "godot", "engine", "2d", "3d"] # possibly: "ffi"
88
categories = ["game-engines", "graphics"]

godot-ffi/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "godot-ffi"
33
version = "0.1.0"
44
edition = "2021"
5-
rust-version = "1.63"
5+
rust-version = "1.66"
66
license = "MPL-2.0"
77
keywords = ["gamedev", "godot", "engine", "ffi"]
88
categories = ["game-engines", "graphics"]

godot-macros/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "godot-macros"
33
version = "0.1.0"
44
edition = "2021"
5-
rust-version = "1.63"
5+
rust-version = "1.66"
66
license = "MPL-2.0"
77
keywords = ["gamedev", "godot", "engine", "derive", "macro"]
88
categories = ["game-engines", "graphics"]

godot/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "godot"
33
version = "0.1.0"
44
edition = "2021"
5-
rust-version = "1.63"
5+
rust-version = "1.66"
66
license = "MPL-2.0"
77
keywords = ["gamedev", "godot", "engine", "2d", "3d"] # possibly: "ffi"
88
categories = ["game-engines", "graphics"]

itest/rust/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "itest"
33
version = "0.1.0"
44
edition = "2021"
5-
rust-version = "1.63"
5+
rust-version = "1.66"
66
publish = false
77

88
[lib]

0 commit comments

Comments
 (0)