From 6b9c086632e5f5ef27ce1c5479fcfb7ecc54048c Mon Sep 17 00:00:00 2001
From: Tiaansu <87069680+Tiaansu@users.noreply.github.com>
Date: Fri, 18 Oct 2024 16:08:13 +0800
Subject: [PATCH] fix conflict on build.yml

---
 .github/workflows/build.yml | 61 ++++++-------------------------------
 1 file changed, 9 insertions(+), 52 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 99c772a6..0a75823e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -90,47 +90,13 @@ jobs:
       with:
         name: streamer-win-debug-${{ steps.current-time.outputs.formattedTime }}-${{ steps.vars.outputs.sha_short }}
         path: build/bin/Debug
-  build-linux-debug:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: recursive
-
-    - name: Declare github variables
-      id: vars
-      shell: bash
-      run: |
-        echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
-        echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
-
-    - name: install packages
-      run: sudo apt-get install g++-multilib
-
-    - name: Install CMake
-      uses: lukka/get-cmake@v3.19.0
-
-    - name: Generate build files
-      run: mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Debug
-
-    - name: Build
-      run: |
-        cd build
-        cmake --build . --config Debug
+  build-linux:
+    runs-on: ubuntu-latest
 
-    - name: Get current time
-      uses: josStorer/get-current-time@v2
-      id: current-time
-      with:
-        format: YYYYMMDD
+    strategy:
+      matrix:
+        config: [Debug, Release]
 
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v3
-      with:
-        name: streamer-linux-debug-${{ steps.current-time.outputs.formattedTime }}-${{ steps.vars.outputs.sha_short }}
-        path: build/bin
-  build-linux-release:
-    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
       with:
@@ -143,19 +109,10 @@ jobs:
         echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
         echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
 
-    - name: install packages
-      run: sudo apt-get install g++-multilib
-
-    - name: Install CMake
-      uses: lukka/get-cmake@v3.19.0
-
-    - name: Generate build files
-      run: mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release
-
     - name: Build
       run: |
-        cd build
-        cmake --build . --config Release
+        cd docker
+        CONFIG=${{ matrix.config == 'Debug' && 'Debug' || 'MinSizeRel' }} ./build.sh
 
     - name: Get current time
       uses: josStorer/get-current-time@v2
@@ -166,5 +123,5 @@ jobs:
     - name: Upload artifacts
       uses: actions/upload-artifact@v3
       with:
-        name: streamer-linux-release-${{ steps.current-time.outputs.formattedTime }}-${{ steps.vars.outputs.sha_short }}
-        path: build/bin
+        name: streamer-linux-${{ matrix.config == 'Debug' && 'debug' || 'release' }}-${{ steps.current-time.outputs.formattedTime }}-${{ steps.vars.outputs.sha_short }}
+        path: docker/build/bin