From ef34ffa7b7c3ca6bca4cb2d54d46dba2a7da0a17 Mon Sep 17 00:00:00 2001
From: bladeoner <bladeoner112@gmail.com>
Date: Sun, 9 Jan 2022 17:42:08 +0100
Subject: [PATCH] Optimize Github workflow (#429)

---
 .../continuous-integration-workflow.yml       | 30 ++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
index c323e65..cacd060 100644
--- a/.github/workflows/continuous-integration-workflow.yml
+++ b/.github/workflows/continuous-integration-workflow.yml
@@ -6,6 +6,9 @@ jobs:
   build:
     name: Build VBA GX
     runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        image: ["Wii", "GameCube"]
     container: devkitpro/devkitppc:latest
  
     steps:
@@ -13,31 +16,44 @@ jobs:
       with:
         submodules: true
 
-    - name: Build
+    - name: Build Wii
+      if: ${{ matrix.image == 'Wii' }}
       run: |
-        make -j2
+        make -f Makefile.wii -j2
     
-    - name: Copy files
+    - name: Copy Wii artifact
+      if: ${{ matrix.image == 'Wii' }}
       run: | 
         mkdir -p dist/VisualBoyAdvanceGX/apps/vbagx
         mkdir -p dist/VisualBoyAdvanceGX/vbagx/roms
         mkdir dist/VisualBoyAdvanceGX/vbagx/saves
-        mkdir dist/VisualBoyAdvanceGX-GameCube/
         touch dist/VisualBoyAdvanceGX/vbagx/roms/romsdir
         touch dist/VisualBoyAdvanceGX/vbagx/saves/savesdir
         cp hbc/* dist/VisualBoyAdvanceGX/apps/vbagx/
         cp executables/vbagx-wii.dol dist/VisualBoyAdvanceGX/apps/vbagx/boot.dol
-        cp executables/vbagx-gc.dol dist/VisualBoyAdvanceGX-GameCube/
 
-    - name: Upload Wii Build Artifacts
+    - name: Upload Wii artifacts
       uses: actions/upload-artifact@v2
+      if: ${{ matrix.image == 'Wii' }}
       with: 
         name: VisualBoyAdvanceGX
         path: |
          dist/VisualBoyAdvanceGX/
+         
+    - name: Build GameCube
+      if: ${{ matrix.image == 'GameCube' }}
+      run: |
+        make -f Makefile.gc -j2
+        
+    - name: Copy GameCube artifact
+      if: ${{ matrix.image == 'GameCube' }}
+      run: | 
+        mkdir -p dist/VisualBoyAdvanceGX-GameCube
+        cp executables/vbagx-gc.dol dist/VisualBoyAdvanceGX-GameCube/
     
-    - name: Upload GameCube Build Artifacts
+    - name: Upload GameCube artifact
       uses: actions/upload-artifact@v2
+      if: ${{ matrix.image == 'GameCube' }}
       with: 
         name: VisualBoyAdvanceGX-GameCube
         path: |