update

Opentrons · Jan 12, 2024 · 0f6847f · 0f6847f
1 parent 0277a26
commit 0f6847f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.github/actions/main-setup/action.yaml b/.github/actions/main-setup/action.yaml
@@ -1,6 +1,11 @@
 name: ot3-firmware Repo Setup
 description: Setup for ot3-firmware Github Actions
 
+inputs:
+  cache-version:
+    description: CACHE_VERSION from secrets
+    required: true
+
 runs:
   using: composite
   steps:
@@ -25,7 +30,7 @@ runs:
       id: cache-tools
       with:
         path: ot3-firmware/stm32-tools
-        key: ${{ runner.os }}-${{ hashFiles('**/cmake/*') }}-${{ env.CACHE_VERSION }}
+        key: ${{ runner.os }}-${{ hashFiles('**/cmake/*') }}-${{ inputs.cache-version }}
 
     - name: Setup opentrons monorepo
       uses: actions/checkout@v4

diff --git a/.github/workflows/gripper.yaml b/.github/workflows/gripper.yaml
@@ -45,7 +45,6 @@ on:
 
 env:
   ci: 1
-  CACHE_VERSION: ${{ secrets.CACHE_VERSION }}
 
 defaults:
   run:
@@ -68,6 +67,8 @@ jobs:
 
       - name: Setup main
         uses: ./actions/.github/actions/main-setup
+        with:
+          cache-version: ${{ secrets.CACHE_VERSION }}
 
       - name: Configure
         run: cmake --preset=cross .
@@ -95,6 +96,8 @@ jobs:
 
       - name: Setup main
         uses: ./actions/.github/actions/main-setup
+        with:
+          cache-version: ${{ secrets.CACHE_VERSION }}
 
       - name: Configure
         run: cmake --preset=host-gcc10 .
@@ -114,4 +117,4 @@ jobs:
         with:
           name: "gripper-simulator-${{github.ref_name}}"
           path: |
-            build-host/gripper/simulator/gripper-simulator
+            ot3-firmware/build-host/gripper/simulator/gripper-simulator