diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
index a0866da9..be46353c 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -3,24 +3,44 @@ name: CI Workflow
 on: [push, pull_request]
 
 jobs:
-  linux-and-macos:
-    runs-on: ${{ matrix.os }}
+  linux:
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
         config: [debug, release]
-        include:
-          - os: ubuntu-latest
-            osname: linux
-          - os: macos-latest
-            osname: osx
+        platform: [x64]
     steps:
     - name: Checkout
       uses: actions/checkout@v2
     - name: Build
-      run: make -f Bootstrap.mak ${{ matrix.osname }} CONFIG=${{ matrix.config }}
+      run: make -f Bootstrap.mak linux CONFIG=${{ matrix.config }}
     - name: Test
       run: bin/${{ matrix.config }}/premake5 test
+    - name: Upload Artifacts
+      if: matrix.config == 'release'
+      uses: actions/upload-artifact@v2
+      with:
+        name: premake-linux-${{ matrix.platform }}
+        path: bin/${{ matrix.config }}/
+  macosx:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        config: [debug, release]
+        platform: [x64]
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Build
+      run: make -f Bootstrap.mak macosx CONFIG=${{ matrix.config }}
+    - name: Test
+      run: bin/${{ matrix.config }}/premake5 test
+    - name: Upload Artifacts
+      if: matrix.config == 'release'
+      uses: actions/upload-artifact@v2
+      with:
+        name: premake-macosx-${{ matrix.platform }}
+        path: bin/${{ matrix.config }}/
   windows:
     runs-on: windows-latest
     strategy:
@@ -38,3 +58,9 @@ jobs:
     - name: Test
       run: bin\${{ matrix.config }}\premake5 test
       shell: cmd
+    - name: Upload Artifacts
+      if: matrix.config == 'release'
+      uses: actions/upload-artifact@v2
+      with:
+        name: premake-windows-${{ matrix.platform }}
+        path: bin\${{ matrix.config }}\