From d1dac027518184681f9b2cc5a8c2f16545e8df53 Mon Sep 17 00:00:00 2001
From: Jan Haller <bromeon@gmail.com>
Date: Mon, 24 Apr 2023 21:11:44 +0200
Subject: [PATCH] Update MSRV to 1.66; fix detection in CI

The unit-test job accidentally used the nightly compiler in MSRV check.
Now, 'minimal-deps' and 'msrv' are two separate jobs.
---
 .github/workflows/full-ci.yml | 18 +++++++++---------
 godot-bindings/Cargo.toml     |  2 +-
 godot-codegen/Cargo.toml      |  2 +-
 godot-core/Cargo.toml         |  2 +-
 godot-ffi/Cargo.toml          |  2 +-
 godot-macros/Cargo.toml       |  2 +-
 godot/Cargo.toml              |  2 +-
 itest/rust/Cargo.toml         |  2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/full-ci.yml b/.github/workflows/full-ci.yml
index 049b531da..372fc80fe 100644
--- a/.github/workflows/full-ci.yml
+++ b/.github/workflows/full-ci.yml
@@ -86,8 +86,14 @@ jobs:
 
           - name: linux
             os: ubuntu-20.04
-            rust-toolchain: '1.63.0'
+            rust-toolchain: nightly
             rust-special: -minimal-deps
+            rust-cache-key: minimal-deps
+
+          - name: linux
+            os: ubuntu-20.04
+            rust-toolchain: '1.66.0'
+            rust-special: -msrv
 
     steps:
       - uses: actions/checkout@v3
@@ -96,14 +102,7 @@ jobs:
         uses: ./.github/composite/rust
         with:
           rust: ${{ matrix.rust-toolchain || 'stable' }}
-          cache-key: ${{ matrix.rust-special }} # '-minimal-deps' or empty/not defined
-
-      - name: "Install Rust nightly (minimal deps)"
-        if: matrix.rust-special == '-minimal-deps'
-        uses: ./.github/composite/rust
-        with:
-          rust: nightly
-          cache-key: minimal-deps-nightly
+          cache-key: ${{ matrix.rust-cache-key }} # only needed when rustc version is possibly the same
 
       - name: "Install minimal dependency versions from Cargo"
         if: matrix.rust-special == '-minimal-deps'
@@ -196,6 +195,7 @@ jobs:
             rust-toolchain: nightly
             rust-env-rustflags: -Zrandomize-layout
 
+
     steps:
       - uses: actions/checkout@v3
 
diff --git a/godot-bindings/Cargo.toml b/godot-bindings/Cargo.toml
index 5b63d8d20..965b0e39a 100644
--- a/godot-bindings/Cargo.toml
+++ b/godot-bindings/Cargo.toml
@@ -2,7 +2,7 @@
 name = "godot-bindings"
 version = "0.1.0"
 edition = "2021"
-rust-version = "1.63"
+rust-version = "1.66"
 license = "MPL-2.0"
 keywords = ["gamedev", "godot", "engine", "ffi", "sys"]
 categories = ["game-engines", "graphics"]
diff --git a/godot-codegen/Cargo.toml b/godot-codegen/Cargo.toml
index a07d3d4af..4a49edbc4 100644
--- a/godot-codegen/Cargo.toml
+++ b/godot-codegen/Cargo.toml
@@ -2,7 +2,7 @@
 name = "godot-codegen"
 version = "0.1.0"
 edition = "2021"
-rust-version = "1.63"
+rust-version = "1.66"
 license = "MPL-2.0"
 keywords = ["gamedev", "godot", "engine", "codegen"]
 categories = ["game-engines", "graphics"]
diff --git a/godot-core/Cargo.toml b/godot-core/Cargo.toml
index b1366baaf..93a7c4978 100644
--- a/godot-core/Cargo.toml
+++ b/godot-core/Cargo.toml
@@ -2,7 +2,7 @@
 name = "godot-core"
 version = "0.1.0"
 edition = "2021"
-rust-version = "1.63"
+rust-version = "1.66"
 license = "MPL-2.0"
 keywords = ["gamedev", "godot", "engine", "2d", "3d"] # possibly: "ffi"
 categories = ["game-engines", "graphics"]
diff --git a/godot-ffi/Cargo.toml b/godot-ffi/Cargo.toml
index b4786b214..ffd94bcd4 100644
--- a/godot-ffi/Cargo.toml
+++ b/godot-ffi/Cargo.toml
@@ -2,7 +2,7 @@
 name = "godot-ffi"
 version = "0.1.0"
 edition = "2021"
-rust-version = "1.63"
+rust-version = "1.66"
 license = "MPL-2.0"
 keywords = ["gamedev", "godot", "engine", "ffi"]
 categories = ["game-engines", "graphics"]
diff --git a/godot-macros/Cargo.toml b/godot-macros/Cargo.toml
index dedd512c0..ef8177962 100644
--- a/godot-macros/Cargo.toml
+++ b/godot-macros/Cargo.toml
@@ -2,7 +2,7 @@
 name = "godot-macros"
 version = "0.1.0"
 edition = "2021"
-rust-version = "1.63"
+rust-version = "1.66"
 license = "MPL-2.0"
 keywords = ["gamedev", "godot", "engine", "derive", "macro"]
 categories = ["game-engines", "graphics"]
diff --git a/godot/Cargo.toml b/godot/Cargo.toml
index 766c6f2b5..c6828b723 100644
--- a/godot/Cargo.toml
+++ b/godot/Cargo.toml
@@ -2,7 +2,7 @@
 name = "godot"
 version = "0.1.0"
 edition = "2021"
-rust-version = "1.63"
+rust-version = "1.66"
 license = "MPL-2.0"
 keywords = ["gamedev", "godot", "engine", "2d", "3d"] # possibly: "ffi"
 categories = ["game-engines", "graphics"]
diff --git a/itest/rust/Cargo.toml b/itest/rust/Cargo.toml
index 8930d8ddb..53f5f203f 100644
--- a/itest/rust/Cargo.toml
+++ b/itest/rust/Cargo.toml
@@ -2,7 +2,7 @@
 name = "itest"
 version = "0.1.0"
 edition = "2021"
-rust-version = "1.63"
+rust-version = "1.66"
 publish = false
 
 [lib]