From b95ad8e484d2bff3680ca6f6bb3d2b60d4a0056b Mon Sep 17 00:00:00 2001
From: Techassi <git@techassi.dev>
Date: Mon, 19 May 2025 10:56:24 +0200
Subject: [PATCH 1/5] feat(run-pre-commit): Support pinning the rustup version

---
 run-pre-commit/README.md  | 1 +
 run-pre-commit/action.yml | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/run-pre-commit/README.md b/run-pre-commit/README.md
index 3b61c8d..0614777 100644
--- a/run-pre-commit/README.md
+++ b/run-pre-commit/README.md
@@ -41,6 +41,7 @@ jobs:
 - `pre-commit-version` (defaults to `4.2.0`)
 - `rust` (eg: `1.80.1`. Disabled if not specified)
 - `rust-components` (defaults to `rustfmt,clippy`)
+- `rustup-version` (defaults to `1.28.1`)
 - `hadolint` (eg: `v2.12.0`. Disabled if not specified)
 - `nix` (eg: `2.25.2`. Disabled if not specified)
 - `nix-github-token` (eg: `secrets.GITHUB_TOKEN`. Required when `nix` is set)
diff --git a/run-pre-commit/action.yml b/run-pre-commit/action.yml
index f3e43f1..4111cb9 100644
--- a/run-pre-commit/action.yml
+++ b/run-pre-commit/action.yml
@@ -18,6 +18,9 @@ inputs:
       Override which Rust components are installed. Only takes effect when Rust
       is installed.
     default: rustfmt,clippy
+  rustup-version:
+    description: Rustup version used when setting up the Rust toolchain(s)
+    default: 1.28.1
   hadolint:
     description: Whether to install hadolint (and which version to use)
   nix:
@@ -79,6 +82,8 @@ runs:
     - name: Setup Rust Toolchain
       uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0
       if: ${{ inputs.rust && steps.rust-toolchain-cache.outputs.cache-hit != 'true' }}
+      env:
+        RUSTUP_VERSION: ${{ inputs.rustup-version }}
       with:
         toolchain: ${{ inputs.rust }}
         components: ${{ inputs.rust-components }}

From e6ad32d841258b8aa62d41f2291cb59ce58416cf Mon Sep 17 00:00:00 2001
From: Techassi <git@techassi.dev>
Date: Mon, 19 May 2025 11:21:55 +0200
Subject: [PATCH 2/5] temp: Print rustup version

---
 run-pre-commit/action.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/run-pre-commit/action.yml b/run-pre-commit/action.yml
index 4111cb9..8209b52 100644
--- a/run-pre-commit/action.yml
+++ b/run-pre-commit/action.yml
@@ -88,6 +88,9 @@ runs:
         toolchain: ${{ inputs.rust }}
         components: ${{ inputs.rust-components }}
 
+    - shell: bash
+      run: rustup --version
+
     - name: Install Hadolint
       if: ${{ inputs.hadolint }}
       shell: bash

From c2ebbe49a23bd53852eb46c32e43f83b36210957 Mon Sep 17 00:00:00 2001
From: Techassi <git@techassi.dev>
Date: Mon, 19 May 2025 12:45:20 +0200
Subject: [PATCH 3/5] Revert "temp: Print rustup version"

This reverts commit e6ad32d841258b8aa62d41f2291cb59ce58416cf.
---
 run-pre-commit/action.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/run-pre-commit/action.yml b/run-pre-commit/action.yml
index 8209b52..4111cb9 100644
--- a/run-pre-commit/action.yml
+++ b/run-pre-commit/action.yml
@@ -88,9 +88,6 @@ runs:
         toolchain: ${{ inputs.rust }}
         components: ${{ inputs.rust-components }}
 
-    - shell: bash
-      run: rustup --version
-
     - name: Install Hadolint
       if: ${{ inputs.hadolint }}
       shell: bash

From 1fa2967e5dddee2b0e8399176fe9fd9d5b8e81b2 Mon Sep 17 00:00:00 2001
From: Techassi <git@techassi.dev>
Date: Mon, 19 May 2025 16:12:38 +0200
Subject: [PATCH 4/5] chore(run-pre-commit): Use rustup version in cache key

---
 run-pre-commit/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/run-pre-commit/action.yml b/run-pre-commit/action.yml
index 4111cb9..3741281 100644
--- a/run-pre-commit/action.yml
+++ b/run-pre-commit/action.yml
@@ -77,7 +77,7 @@ runs:
       uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
       with:
         path: ~/.rustup/toolchains
-        key: rust-toolchains-${{ inputs.rust }}-components-${{ env.RUST_COMPONENTS }}
+        key: rust-toolchains-${{ inputs.rust }}-components-${{ env.RUST_COMPONENTS }}-rustup-${{ inputs.rustup-version }}
 
     - name: Setup Rust Toolchain
       uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0

From 610d6db3051e855e3a09a5916624a244d3ef42dc Mon Sep 17 00:00:00 2001
From: Techassi <git@techassi.dev>
Date: Mon, 19 May 2025 16:13:27 +0200
Subject: [PATCH 5/5] chore(run-pre-commit): Pass rustup version as input

---
 run-pre-commit/action.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/run-pre-commit/action.yml b/run-pre-commit/action.yml
index 3741281..30421b0 100644
--- a/run-pre-commit/action.yml
+++ b/run-pre-commit/action.yml
@@ -82,11 +82,10 @@ runs:
     - name: Setup Rust Toolchain
       uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0
       if: ${{ inputs.rust && steps.rust-toolchain-cache.outputs.cache-hit != 'true' }}
-      env:
-        RUSTUP_VERSION: ${{ inputs.rustup-version }}
       with:
         toolchain: ${{ inputs.rust }}
         components: ${{ inputs.rust-components }}
+        rustup-version: ${{ inputs.rustup-version }}
 
     - name: Install Hadolint
       if: ${{ inputs.hadolint }}