From b6dc6b3b3ef86952671c35aca87b6f5c50f83197 Mon Sep 17 00:00:00 2001
From: Vladimir Vukicevic <vladv@unity3d.com>
Date: Mon, 16 Sep 2024 09:46:53 -0700
Subject: [PATCH 1/3] Use Rust 1.80 for cross compile tests

---
 .github/workflows/rust.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index f7c6b2a7..cde9b7e9 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -77,7 +77,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install Rust
-        run: rustup update stable && rustup default stable && rustup target add ${{ matrix.target }}
+        # 1.81 causes issues when running the tests
+        #run: rustup update stable && rustup default stable && rustup target add ${{ matrix.target }}
+        run: rustup install 1.80 && rustup default 1.80 && rustup target add ${{ matrix.target }}
       - name: Install cross
         # Latest cross release 0.2.5 fails to link binaries for the `aarch64-linux-android` target. A release is pending.
         # Use a specific commit until the release is out. See https://github.com/cross-rs/cross/issues/1222

From ebefd9686a7d69afc1a764fddf54e8ce1a2e1581 Mon Sep 17 00:00:00 2001
From: Vladimir Vukicevic <vladv@unity3d.com>
Date: Mon, 16 Sep 2024 10:40:23 -0700
Subject: [PATCH 2/3] 1.80 everywhere

---
 .github/workflows/rust.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index cde9b7e9..04456e6d 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -47,7 +47,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install Rust
-        run: rustup target add ${{ matrix.target }}
+        #run: rustup target add ${{ matrix.target }}
+        run: rustup install 1.80 && rustup default 1.80 && rustup target add ${{ matrix.target }}
       - if: ${{ matrix.is_musl }}
         name: Install musl-tools
         run: sudo apt-get install -y musl-tools
@@ -105,7 +106,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install Rust
-        run: rustup target add ${{ matrix.target }}
+        #run: rustup target add ${{ matrix.target }}
+        run: rustup install 1.80 && rustup default 1.80 && rustup target add ${{ matrix.target }}
       - name: Check
         run: cargo check --workspace --verbose --target=${{ matrix.target }}
       - name: Clippy

From 503ec16e6df4cecbd0a29f00cb5a1654dbe170e0 Mon Sep 17 00:00:00 2001
From: Vladimir Vukicevic <vladv@unity3d.com>
Date: Mon, 16 Sep 2024 10:46:04 -0700
Subject: [PATCH 3/3] Who can forget clippy?

---
 .github/workflows/rust.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 04456e6d..0d89d473 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -48,7 +48,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Install Rust
         #run: rustup target add ${{ matrix.target }}
-        run: rustup install 1.80 && rustup default 1.80 && rustup target add ${{ matrix.target }}
+        run: rustup install 1.80 && rustup default 1.80 && rustup target add ${{ matrix.target }} && rustup component add clippy rustfmt
       - if: ${{ matrix.is_musl }}
         name: Install musl-tools
         run: sudo apt-get install -y musl-tools
@@ -80,7 +80,7 @@ jobs:
       - name: Install Rust
         # 1.81 causes issues when running the tests
         #run: rustup update stable && rustup default stable && rustup target add ${{ matrix.target }}
-        run: rustup install 1.80 && rustup default 1.80 && rustup target add ${{ matrix.target }}
+        run: rustup install 1.80 && rustup default 1.80 && rustup target add ${{ matrix.target }} && rustup component add clippy rustfmt
       - name: Install cross
         # Latest cross release 0.2.5 fails to link binaries for the `aarch64-linux-android` target. A release is pending.
         # Use a specific commit until the release is out. See https://github.com/cross-rs/cross/issues/1222
@@ -107,7 +107,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Install Rust
         #run: rustup target add ${{ matrix.target }}
-        run: rustup install 1.80 && rustup default 1.80 && rustup target add ${{ matrix.target }}
+        run: rustup install 1.80 && rustup default 1.80 && rustup target add ${{ matrix.target }} && rustup component add clippy rustfmt
       - name: Check
         run: cargo check --workspace --verbose --target=${{ matrix.target }}
       - name: Clippy