[ACTIONS] Rework workflows for idiotic upload v4

darthcloud · Sep 14, 2024 · a62f221 · a62f221
1 parent aae7331
commit a62f221
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
       matrix:
         hw_version: [hw1, hw2]
         br_config:
-          [3do, cdi, dreamcast, gamecube, gbahd, genesis, jaguar, jvs_arcade, n64, nes,
+          [common, 3do, cdi, dreamcast, gamecube, gbahd, genesis, jaguar, jvs_arcade, n64, nes,
           parallel_1p, parallel_1p_3v3, parallel_2p, parallel_2p_3v3, pc_engine, pcfx,
           playstation, saturn, snes, universal, virtualboy, wii_extension]
         include:
@@ -48,13 +48,21 @@ jobs:
       run: |
         mkdir ota
         mv ota_data_initial.bin ota/
-    - name: Upload artifact
-      uses: darthcloud/upload-artifact@v4
+    - name: Upload common artifact
+      uses: actions/upload-artifact@v4
+      if: ${{ matrix.br_config == 'common' }}
       with:
         name: ${{ env.br_version }}_${{ matrix.hw_version }}
         path: |
           build/partition_table/partition-table.bin
           build/bootloader/bootloader.bin
           build/ota/ota_data_initial.bin
-          build/BlueRetro*.bin
         if-no-files-found: error
+    - name: Upload firmware artifact
+      uses: actions/upload-artifact@v4
+      if: ${{ matrix.br_config != 'common' }}
+      with:
+        name: ${{ env.br_version }}_${{ matrix.hw_version }}
+        path: |
+          build/BlueRetro*.bin
+        if-no-files-found: error
diff --git a/configs/hw1/common b/configs/hw1/common
@@ -0,0 +1,2 @@
+CONFIG_BLUERETRO_HW2=n
+CONFIG_BLUERETRO_SYSTEM_PARALLEL_1P=y
diff --git a/configs/hw2/common b/configs/hw2/common
@@ -0,0 +1 @@
+CONFIG_BLUERETRO_SYSTEM_PARALLEL_1P=y
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		CONFIG_BLUERETRO_HW2=n
		CONFIG_BLUERETRO_SYSTEM_PARALLEL_1P=y