From 0a2e099886c846103c593942a84c467559092a9b Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@pimoroni.com>
Date: Thu, 18 May 2023 11:55:21 +0100
Subject: [PATCH] CI: Add workflow version to cache key.

---
 .github/workflows/micropython.yml | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/micropython.yml b/.github/workflows/micropython.yml
index 32a344d8..c18de168 100644
--- a/.github/workflows/micropython.yml
+++ b/.github/workflows/micropython.yml
@@ -8,6 +8,7 @@ on:
 
 env:
   MICROPYTHON_VERSION: v1.20.0
+  WORKFLOW_VERSION: v0
 
 jobs:
   deps:
@@ -19,9 +20,9 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ${{runner.workspace}}
-        key: workspace-micropython-${{env.MICROPYTHON_VERSION}}-nano-specs
+        key: workspace-micropython-${{env.MICROPYTHON_VERSION}}-${{env.WORKFLOW_VERSION}}
         restore-keys: |
-          workspace-micropython-${{env.MICROPYTHON_VERSION}}-nano-specs
+          workspace-micropython-${{env.MICROPYTHON_VERSION}}-${{env.WORKFLOW_VERSION}}
 
     # Check out MicroPython
     - name: Checkout MicroPython
@@ -109,9 +110,9 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ${{runner.workspace}}
-        key: workspace-micropython-${{env.MICROPYTHON_VERSION}}
+        key: workspace-micropython-${{env.MICROPYTHON_VERSION}}-${{env.WORKFLOW_VERSION}}
         restore-keys: |
-          workspace-micropython-${{env.MICROPYTHON_VERSION}}
+          workspace-micropython-${{env.MICROPYTHON_VERSION}}-${{env.WORKFLOW_VERSION}}
 
     - name: Install Compiler & CCache
       if: runner.os == 'Linux'
@@ -129,20 +130,6 @@ jobs:
         echo "MICROPY_GIT_TAG=$MICROPYTHON_VERSION, ${{matrix.name}} ${{github.event.release.tag_name || github.sha}}" >> $GITHUB_ENV
         echo "MICROPY_GIT_HASH=$MICROPYTHON_VERSION-${{github.event.release.tag_name || github.sha}}" >> $GITHUB_ENV
 
-    - name: "HACK: Clean ports/rp2/modules and ports/rp2/CMakeLists.txt"
-      shell: bash
-      working-directory: micropython/ports/rp2
-      run: |
-        rm -rf modules
-        git checkout modules
-  
-    - name: "HACK: Revert Patches"  # Avoid an already-patched MicroPython tree breaking our build
-      shell: bash
-      working-directory: micropython
-      run: |
-        git checkout lib/pico-sdk
-        git checkout ports/rp2/CMakeLists.txt
-
     - name: "HACK: CMakeLists.txt Disable C++ Exceptions Patch"
       shell: bash
       working-directory: micropython