From 137d2d5a3a6f7b86b852e9e22ef4b3898dec532d Mon Sep 17 00:00:00 2001
From: Jonas Bushart <jonas@bushart.org>
Date: Fri, 29 Jul 2022 22:28:32 +0200
Subject: [PATCH] Set environment variables before running rust-cache

---
 CHANGELOG.md |  7 +++++++
 action.yml   | 24 +++++++++++++-----------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6242ec8..352511d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.2.1] - 2022-07-29
+
+### Fixed
+
+* Set environment variables before invoking the cache action.
+    This ensures restoring and saving are using the same cache key.
+
 ## [1.2.0] - 2022-07-21
 
 ### Added
diff --git a/action.yml b/action.yml
index 0ae1daf..57a43f4 100644
--- a/action.yml
+++ b/action.yml
@@ -50,6 +50,19 @@ runs:
         targets: ${{inputs.target}}
         components: ${{inputs.components}}
       shell: bash
+    # The environment variables always need to be set before the caching action
+    - name: "Setting Environment Variables"
+      run: |
+        echo "CARGO_INCREMENTAL=0" >> $GITHUB_ENV
+        echo "CARGO_PROFILE_DEV_DEBUG=0" >> $GITHUB_ENV
+        echo "CARGO_TERM_COLOR=always" >> $GITHUB_ENV
+        echo "RUST_BACKTRACE=short" >> $GITHUB_ENV
+        echo "RUSTFLAGS=-D warnings" >> $GITHUB_ENV
+      shell: bash
+    - name: "Install Rust Problem Matcher"
+      run: echo "::add-matcher::${{ github.action_path }}/rust.json"
+      shell: bash
+
     - name: Install rustup, if needed
       run: |
         if ! command -v rustup &> /dev/null ; then
@@ -88,14 +101,3 @@ runs:
 
     - name: "Setup Rust Caching"
       uses: Swatinem/rust-cache@v2
-    - name: "Install Rust Problem Matcher"
-      run: echo "::add-matcher::${{ github.action_path }}/rust.json"
-      shell: bash
-    - name: "Setting Environment Variables"
-      run: |
-        echo "CARGO_INCREMENTAL=0" >> $GITHUB_ENV
-        echo "CARGO_PROFILE_DEV_DEBUG=0" >> $GITHUB_ENV
-        echo "CARGO_TERM_COLOR=always" >> $GITHUB_ENV
-        echo "RUST_BACKTRACE=short" >> $GITHUB_ENV
-        echo "RUSTFLAGS=-D warnings" >> $GITHUB_ENV
-      shell: bash