Update workflows

baderouaich · Jun 27, 2024 · 210f4a9 · 210f4a9
1 parent d769d5e
commit 210f4a9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
@@ -26,7 +26,7 @@ jobs:
           sudo apt install gcc-12 g++-12
 
       - name: Installing necessary system libraries
-        run: sudo apt install cmake libgl1-mesa-dev libxi-dev libx11-dev xorg-dev libwayland-dev libxkbcommon-dev libxcursor-dev libxrandr-dev libxcomposite-dev libxinerama-dev libtbb-dev
+        run: sudo apt install cmake ninja-build libgl1-mesa-dev libxi-dev libx11-dev xorg-dev libwayland-dev libxkbcommon-dev libxcursor-dev libxrandr-dev libxcomposite-dev libxinerama-dev libtbb-dev
 
       - name: Generating CMake Project & Build project
         run: mkdir build && cd build && cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release && ninja -j$(nproc) -DCMAKE_CXX_COMPILER=g++-12 -DCMAKE_C_COMPILER=gcc-12

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -27,12 +27,12 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Setup MSBuild
-        uses: microsoft/setup-msbuild@v1.0.2
+        uses: microsoft/setup-msbuild@v2
         with:
           vs-version: '16.8' #using vs 16.8.3 in my local machine Help -> About Microsoft Visual Studio
 
       - name: Generate Project Files
-        run: .\Premake\Windows\premake5.exe vs2019 --file=premake5.lua
+        run: mkdir build && cd build && cmake .. -G"Visual Studio 16" -DCMAKE_BUILD_TYPE=Release && ninja -j$(nproc)
 
       - name: Build Solution
-        run: msbuild Enigma.sln -property:Configuration=Release,MultiProcessorCompilation=true -maxCpuCount -verbosity:minimal -noLogo
+        run: cd build && msbuild Enigma.sln -property:Configuration=Release,MultiProcessorCompilation=true -maxCpuCount -verbosity:minimal -noLogo