chore: More GHA fixes.

zmkfirmware · Jan 14, 2025 · c0aeda6 · c0aeda6
1 parent 2be20c8
commit c0aeda6
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/.github/workflows/export.yaml b/.github/workflows/export.yaml
@@ -9,19 +9,30 @@ jobs:
     if: ${{ always() }}
     runs-on: ubuntu-latest
     container:
-      image: docker.io/setsoft/kicad_auto:dev_k6
+      image: ghcr.io/inti-cmnb/kicad8_auto:dev
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Run kibot
         run: kibot -vvv
       - name: Archive Gerber ZIP
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: jlc
+          name: jlc-gerber
           path: JLCPCB/zmk-uno-JLCPCB.zip
       - name: Archive Positions/BOM
         uses: actions/upload-artifact@v4
         with:
-          name: jlc
+          name: jlc-positions-bom
           path: zmk-uno_*jlc.csv
+  merge:
+    runs-on: ubuntu-latest
+    needs: export
+    name: Merge Export Artifacts
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: ${{ inputs.archive_name }}
+          pattern: jlc-*
+          delete-merged: true