update

Opentrons · Jan 12, 2024 · 6dbbc4f · 6dbbc4f
1 parent 7146501
commit 6dbbc4f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/.github/actions/main-setup/action.yaml b/.github/actions/main-setup/action.yaml
@@ -11,7 +11,6 @@ runs:
         sudo apt install -y gcc-10 g++-10
 
     - name: Setup Python
-      if: ${{ contains(github.job, 'host') || contains(github.workflow, 'test')}}
       uses: actions/setup-python@v4
       with:
         python-version: '3.10'
@@ -29,7 +28,6 @@ runs:
         key: ${{ runner.os }}-${{ hashFiles('**/cmake/*') }}-${{ env.CACHE_VERSION }}
 
     - name: Setup opentrons monorepo
-      if: ${{ contains(github.workflow, 'host') || contains(github.workflow, 'test')}}
       uses: actions/checkout@v4
       with:
         path: opentrons
diff --git a/.github/workflows/gripper.yaml b/.github/workflows/gripper.yaml
@@ -50,7 +50,6 @@ env:
 defaults:
   run:
     shell: bash
-    working-directory: ot3-firmware
 
 jobs:
   cross-compile-check:
@@ -69,6 +68,8 @@ jobs:
       - name: Setup main
         uses: ./actions/.github/actions/main-setup
 
+      - name: Configure
+        run: cd ot3-firmware && cmake --preset=cross .
       - name: "Format"
         run: cmake --build ./build-cross --target gripper-format-ci
       - name: "Build"
@@ -92,19 +93,22 @@ jobs:
       - name: Setup main
         uses: ./actions/.github/actions/main-setup
 
-#      - name: 'Build and test'
-#        run: cmake --build ./build-host --target gripper-build-and-test
-#
-#      - name: 'Setup state_manager'
-#        run: cmake --build ./build-host/ --target state-manager-setup
-#
-#      - name: 'Build simulator'
-#        run: cmake --build ./build-host --target gripper-simulator
+      - name: Configure
+        run: cd ot3-firmware && cmake --preset=host-gcc10 .
 
-#      - name: "Upload artifacts"
-#        if: github.event_name != 'pull_request'
-#        uses: actions/upload-artifact@v3
-#        with:
-#          name: "gripper-simulator-${{github.ref_name}}"
-#          path: |
-#            build-host/gripper/simulator/gripper-simulator
+      - name: 'Build and test'
+        run: cmake --build ./build-host --target gripper-build-and-test
+
+      - name: 'Setup state_manager'
+        run: cmake --build ./build-host/ --target state-manager-setup
+
+      - name: 'Build simulator'
+        run: cmake --build ./build-host --target gripper-simulator
+
+      - name: "Upload artifacts"
+        if: github.event_name != 'pull_request'
+        uses: actions/upload-artifact@v3
+        with:
+          name: "gripper-simulator-${{github.ref_name}}"
+          path: |
+            build-host/gripper/simulator/gripper-simulator