From 0f6847f1d68be31789c63092336fe2449748aa5c Mon Sep 17 00:00:00 2001 From: ahiuchingau <20424172+ahiuchingau@users.noreply.github.com> Date: Fri, 12 Jan 2024 13:51:39 -0500 Subject: [PATCH] update --- .github/actions/main-setup/action.yaml | 7 ++++++- .github/workflows/gripper.yaml | 7 +++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/actions/main-setup/action.yaml b/.github/actions/main-setup/action.yaml index 725f1eedf..f2c0c5e6f 100644 --- 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 index 979d74149..d547b4d27 100644 --- 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