Merge pull request #21 from dtolnay/cachekey

Add an output intended for cache keys
dtolnay · Jul 15, 2022 · 7961e77 · 7961e77
2 parents 18ca32f + 378ab83
commit 7961e77
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,4 +32,6 @@ jobs:
           toolchain: ${{matrix.rust}}
       - name: Check ${{'${{steps.toolchain.outputs.version}}'}}
         run: echo '${{steps.toolchain.outputs.version}}'
+      - name: Check ${{'${{steps.toolchain.outputs.cachekey}}'}}
+        run: echo '${{steps.toolchain.outputs.cachekey}}'
       - run: rustc --version
diff --git a/action.yml b/action.yml
@@ -17,8 +17,11 @@ inputs:
     required: false
 
 outputs:
+  cachekey:
+    description: A short hash of the rustc version, appropriate for use as a cache key. "20220627a831"
+    value: ${{steps.rustc-version.outputs.cachekey}}
   version:
-    description: Version as reported by `rustc --version`, e.g. "rustc 1.62.0 (a8314ef7d 2022-06-27)"
+    description: Version as reported by `rustc --version`. "rustc 1.62.0 (a8314ef7d 2022-06-27)"
     value: ${{steps.rustc-version.outputs.version}}
 
 runs:
@@ -48,7 +51,12 @@ runs:
     - run: rustup default ${{inputs.toolchain}}
       shell: bash
     - id: rustc-version
-      run: echo "::set-output name=version::$(rustc --version)"
+      run: |
+        : set outputs
+        DATE=$(rustc --version --verbose | sed -ne 's/^commit-date: \(20[0-9][0-9]\)-\([01][0-9]\)-\([0-3][0-9]\)$/\1\2\3/p')
+        HASH=$(rustc --version --verbose | sed -ne 's/^commit-hash: //p')
+        echo "::set-output name=cachekey::$(echo $DATE$HASH | head -c12)"
+        echo "::set-output name=version::$(rustc --version)"
       shell: bash
     - run: rustc --version --verbose
       shell: bash