Skip to content

Commit e57b06d

Browse files
fix windows and linux
1 parent 90eb8ab commit e57b06d

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

.github/workflows/job-cmakebuild-linux.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616
- name: Checkout repository
1717
uses: actions/checkout@v4
1818

19-
#- name: Setup Powershell Repository
20-
#run: curl -O https://packages.microsoft.com/config/ubuntu/24.04/packages-microsoft-prod.deb && sudo dpkg -i packages-microsoft-prod.deb
19+
- name: Setup Powershell Repository
20+
run: curl -O https://github.com/PowerShell/PowerShell/releases/download/v7.5.2/powershell_7.5.2-1.deb_amd64.deb && sudo dpkg -i powershell_7.5.2-1.deb_amd64.deb
2121

2222
- name: Install External Dependencies
23-
run: sudo apt-get update && sudo apt-get install -y git libasound2-dev libgl1-mesa-dev libpulse-dev libdbus-1-dev libx11-dev libxcursor-dev libxext-dev libxi-dev libxinerama-dev libxrandr-dev libxss-dev libxt-dev libxxf86vm-dev cmake gcc g++ ninja-build libassimp-dev libfmt-dev libimgui-dev libstb-dev libglfw3-dev libspdlog-dev libglm-dev libyaml-cpp-dev libspirv-cross-c-shared-dev spirv-cross spirv-tools glslang-dev glslang-tools nlohmann-json3-dev dotnet-runtime-8.0 libgtest-dev powershell
23+
run: sudo apt-get update && sudo apt-get install -y git libasound2-dev libgl1-mesa-dev libpulse-dev libdbus-1-dev libx11-dev libxcursor-dev libxext-dev libxi-dev libxinerama-dev libxrandr-dev libxss-dev libxt-dev libxxf86vm-dev cmake gcc g++ ninja-build libassimp-dev libfmt-dev libimgui-dev libstb-dev libglfw3-dev libspdlog-dev libglm-dev libyaml-cpp-dev libspirv-cross-c-shared-dev spirv-cross spirv-tools glslang-dev glslang-tools nlohmann-json3-dev dotnet-runtime-8.0 libgtest-dev
2424

2525
- name: CMake Build
2626
run: .\Scripts\BuildEngine.ps1 -Configurations ${{ inputs.configuration }} -RunClangFormat 0

CMakePresets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
{
1010
"name": "Windows_Debug",
1111
"displayName": "Windows Visual Studio Debug",
12-
"generator": "Visual Studio 2022",
12+
"generator": "Visual Studio 17 2022",
1313
"binaryDir": "${sourceDir}/../builds/RendererEngine",
1414
"cacheVariables": {
1515
"CMAKE_BUILD_TYPE": "Debug",

0 commit comments

Comments
 (0)