From 827b791dd74396dc057cb064b9523a76cd9ab3f4 Mon Sep 17 00:00:00 2001
From: Inder00 <inder00@wp.pl>
Date: Sat, 25 Dec 2021 08:57:14 +0100
Subject: [PATCH 1/4] GIthub CI Refactor

---
 .github/workflows/build.yaml | 108 +++++++++++++----------------------
 1 file changed, 40 insertions(+), 68 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index dd5d201fea..931efe77cc 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -4,8 +4,11 @@ name: Build
 on: [push, pull_request]
 
 jobs:
-  windows-release:
-    name: windows-release
+  windows:
+    strategy:
+      matrix:
+        type: [release, debug]
+    name: windows-${{ matrix.type }}
     runs-on: windows-2022
     steps:
       - uses: actions/checkout@v2
@@ -32,51 +35,16 @@ jobs:
       - name: Install data files
         run: utils\premake5 install_data
 
-      - name: Run Build
+      - name: Run Build [Release]
+        if: ${{ matrix.type == 'release' }}
         run: win-build.bat
         shell: cmd
         env:
           DXSDK_DIR: './utils/DXFiles/'
           CI: 'true'
 
-      - name: Create build artifacts
-        run: utils\premake5 compose_files
-
-      - uses: actions/upload-artifact@master
-        with:
-          name: InstallFiles
-          path: InstallFiles/
-
-
-  windows-debug:
-    name: windows-debug
-    runs-on: windows-2022
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions/cache@v1
-        id: cache-dxfiles
-        with:
-          path: utils/DXFiles
-          key: dxfiles-0001
-
-      - name: Download DirectX
-        if: steps.cache-dxfiles.outputs.cache-hit != 'true'
-        run: Invoke-WebRequest https://mirror.mtasa.com/bdata/DXFiles.zip -OutFile utils/DXFiles.zip
-        shell: powershell
-
-      - name: Extract DirectX
-        if: steps.cache-dxfiles.outputs.cache-hit != 'true'
-        run: Expand-Archive -Path utils/DXFiles.zip -DestinationPath utils/DXFiles
-        shell: powershell
-
-      - name: Install CEF
-        run: utils\premake5 install_cef
-
-      - name: Install data files
-        run: utils\premake5 install_data
-
-      - name: Run Build
+      - name: Run Build [Debug]
+        if: ${{ matrix.type == 'debug' }}
         run: win-build.bat Debug
         shell: cmd
         env:
@@ -87,52 +55,56 @@ jobs:
         run: utils\premake5 compose_files
 
       - uses: actions/upload-artifact@master
+        if: ${{ matrix.type == 'release' }}
+        with:
+          name: InstallFiles
+          path: InstallFiles/
+
+      - uses: actions/upload-artifact@master
+        if: ${{ matrix.type == 'debug' }}
         with:
           name: InstallFiles-debug
           path: InstallFiles/
 
-  macOS-release:
-    name: macOS-release
+  macOS:
+    strategy:
+      matrix:
+        type: [release, debug]
+    name: macOS-${{ matrix.type }}
     runs-on: macOS-latest
     steps:
-      - name: Install MySQL
-        run: brew install mysql
-        continue-on-error: true
-      - name: Link MySQL
-        run: brew link --overwrite mysql
       - uses: actions/checkout@v2
-      - name: Run Build
-        run: ./linux-build.sh
 
-  macOS-debug:
-    name: macOS-debug
-    runs-on: macOS-latest
-    steps:
       - name: Install MySQL
         run: brew install mysql
         continue-on-error: true
+
       - name: Link MySQL
         run: brew link --overwrite mysql
-      - uses: actions/checkout@v2
-      - name: Run Build
+
+      - name: Run Build [Release]
+        if: ${{ matrix.type == 'release' }}
+        run: ./linux-build.sh
+
+      - name: Run Build [Debug]
+        if: ${{ matrix.type == 'debug' }}
         run: ./linux-build.sh "" debug
 
-  linux-release:
-    name: linux-release
+  linux:
+    strategy:
+      matrix:
+        type: [release, debug]
+    name: linux-${{ matrix.type }}
     runs-on: ubuntu-latest
     container:
       image: docker://ghcr.io/multitheftauto/mtasa-blue-build:latest
     steps:
       - uses: actions/checkout@v2
-      - name: Run Build
+
+      - name: Run Build [Release]
+        if: ${{ matrix.type == 'release' }}
         run: ./linux-build.sh
 
-  linux-debug:
-    name: linux-debug
-    runs-on: ubuntu-latest
-    container:
-      image: docker://ghcr.io/multitheftauto/mtasa-blue-build:latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Run Build
-        run: ./linux-build.sh "" debug
+      - name: Run Build [Debug]
+        if: ${{ matrix.type == 'debug' }}
+        run: ./linux-build.sh "" debug
\ No newline at end of file

From 598e251781e31ff5848d22c0658dd686d5444827 Mon Sep 17 00:00:00 2001
From: Inder00 <inder00@wp.pl>
Date: Sat, 25 Dec 2021 09:06:03 +0100
Subject: [PATCH 2/4] CI re-run


From 162d3b2f85adb14c28537abe31e53c4cdd1bfacf Mon Sep 17 00:00:00 2001
From: Inder00 <inder00@wp.pl>
Date: Sat, 25 Dec 2021 09:32:17 +0100
Subject: [PATCH 3/4] CI re-run due to failed netc.dll download


From 9ef843c1ec6ad368e999ed748e21c8358e6b5027 Mon Sep 17 00:00:00 2001
From: Inder00 <inder00@wp.pl>
Date: Sat, 25 Dec 2021 09:36:07 +0100
Subject: [PATCH 4/4] CI re-run due to failed netc.dll download again