From 87b5d93b4d91d9c188e9b8546ce42a5b26edbf8e Mon Sep 17 00:00:00 2001
From: Cleverson <smileyznl@gmail.com>
Date: Mon, 12 Aug 2024 22:15:53 -0300
Subject: [PATCH] Updated workflow

Updated workflow
---
 .github/workflows/{makefile.yml => build.yml} | 61 ++++++++++++++++---
 .github/workflows/msbuild.yml                 | 50 ---------------
 2 files changed, 52 insertions(+), 59 deletions(-)
 rename .github/workflows/{makefile.yml => build.yml} (70%)
 delete mode 100644 .github/workflows/msbuild.yml

diff --git a/.github/workflows/makefile.yml b/.github/workflows/build.yml
similarity index 70%
rename from .github/workflows/makefile.yml
rename to .github/workflows/build.yml
index 75e66da..698563c 100644
--- a/.github/workflows/makefile.yml
+++ b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: Linux Build CI
+name: Build C/C++
 
 on:
   push:
@@ -7,8 +7,8 @@ on:
     branches: [ main ]
 
 jobs:
-  build:
-
+  linux:
+    name: Linux Build
     runs-on: ubuntu-latest
 
     steps:
@@ -28,7 +28,7 @@ jobs:
         mkdir temp
         cd temp
 
-        # AMD 64
+        # amd64
         wget http://mirrors.kernel.org/ubuntu/pool/universe/g/gcc-4.8/g++-4.8_4.8.5-4ubuntu8_amd64.deb
         wget http://mirrors.kernel.org/ubuntu/pool/universe/g/gcc-4.8/libstdc++-4.8-dev_4.8.5-4ubuntu8_amd64.deb
         wget http://mirrors.kernel.org/ubuntu/pool/universe/g/gcc-4.8/gcc-4.8-base_4.8.5-4ubuntu8_amd64.deb
@@ -50,10 +50,10 @@ jobs:
         
     - name: Update GCC and G++ alternatives
       run: |
-        sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 50 
-        sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50 
-        sudo update-alternatives --config gcc 
-        sudo update-alternatives --config g++ 
+        sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 50
+        sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
+        sudo update-alternatives --config gcc
+        sudo update-alternatives --config g++
 
     - name: Run build
       working-directory: ./AccuracyFix
@@ -73,5 +73,48 @@ jobs:
     - name: Deploy artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: accuracyfix-linux
+        name: linux32
+        path: publish/*
+        
+  windows:
+    name: Windows Build
+    runs-on: windows-latest
+      
+    env:
+      SOLUTION_FILE_PATH: .
+      BUILD_CONFIGURATION: Release
+  
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Add MSBuild to PATH
+      uses: microsoft/setup-msbuild@v2
+
+    - name: Restore NuGet packages
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      run: nuget restore ${{env.SOLUTION_FILE_PATH}}
+
+    - name: Run Build
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}
+
+    - name: Move release file to publish
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      run: |
+        # Make publish directory
+        mkdir publish\addons\accuracyfix\dlls
+
+        # Move released dll to publish
+        move ${{env.BUILD_CONFIGURATION}}\*.dll publish\addons\accuracyfix\dlls
+
+        # Move settings file to folder
+        mv ${{env.SOLUTION_FILE_PATH}}\cstrike\addons\accuracyfix\accuracyfix.cfg publish\addons\accuracyfix\accuracyfix.cfg
+
+    - name: Deploy artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: win32
         path: publish/*
+        
+        
+        
diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
deleted file mode 100644
index e590b6d..0000000
--- a/.github/workflows/msbuild.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: Windows Build CI
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-env:
-  SOLUTION_FILE_PATH: .
-  BUILD_CONFIGURATION: Release
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: windows-latest
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Add MSBuild to PATH
-      uses: microsoft/setup-msbuild@v1.1.3
-
-    - name: Restore NuGet packages
-      working-directory: ${{env.GITHUB_WORKSPACE}}
-      run: nuget restore ${{env.SOLUTION_FILE_PATH}}
-
-    - name: Run Build
-      working-directory: ${{env.GITHUB_WORKSPACE}}
-      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}
-
-    - name: Move release file to publish
-      working-directory: ${{env.GITHUB_WORKSPACE}}
-      run: |
-        # Make publish directory
-        mkdir publish\addons\accuracyfix\dlls
-
-        # Move released dll to publish
-        move ${{env.BUILD_CONFIGURATION}}\*.dll publish\addons\accuracyfix\dlls
-
-        # Move settings file to folder
-        mv ${{env.SOLUTION_FILE_PATH}}\cstrike\addons\accuracyfix\accuracyfix.cfg publish\addons\accuracyfix\accuracyfix.cfg
-
-    - name: Deploy artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        name: accuracyfix-windows
-        path: publish/*