From 25a9f72ee9f906d790dbfc4e79090bc21d1f1bdd Mon Sep 17 00:00:00 2001 From: georgemoralis Date: Thu, 11 May 2023 14:57:55 +0300 Subject: [PATCH 1/6] Update windows.yml fixed actions try1 --- .github/workflows/windows.yml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index ba1a46b3..199a838c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -12,13 +12,8 @@ on: branches: [ "main" ] env: - # Path to the solution file relative to the root of the project. - SOLUTION_FILE_PATH: ./ - - # Configuration type to build. - # You can convert this to a build matrix if you need coverage of multiple configuration types. - # https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix - BUILD_CONFIGURATION: Release + # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) + BUILD_TYPE: Release permissions: contents: read @@ -32,14 +27,9 @@ jobs: with: submodules: recursive - - name: Add MSBuild to PATH - uses: microsoft/setup-msbuild@v1.3.1 - - name: Build - working-directory: ${{env.GITHUB_WORKSPACE}} - # Add additional options to the MSBuild command line here (like platform or verbosity level). - # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference - run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}} + # Build your program with the given configuration + run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} - name: Upload a Build Artifact uses: actions/upload-artifact@v3.1.2 From e05a9b9343cd7ef5a49b40a1d51c2ea9255d92ca Mon Sep 17 00:00:00 2001 From: georgemoralis Date: Thu, 11 May 2023 15:04:07 +0300 Subject: [PATCH 2/6] Update windows.yml fixing cmake try2 --- .github/workflows/windows.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 199a838c..6d9d1b55 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -27,6 +27,11 @@ jobs: with: submodules: recursive + - name: Configure CMake + # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. + # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + - name: Build # Build your program with the given configuration run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} From 933817279a110f8501bb155cdd11b310878ba340 Mon Sep 17 00:00:00 2001 From: georgemoralis Date: Thu, 11 May 2023 15:26:21 +0300 Subject: [PATCH 3/6] Update windows.yml trying to fix artifact --- .github/workflows/windows.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 6d9d1b55..074685ed 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -41,4 +41,6 @@ jobs: with: name: shadps4-win64 # A file, directory or wildcard pattern that describes what to upload - path: x64/Release + path: | + out/build/x64/Release/shadps4.exe + out/build/x64/Release/SDL3.dll From 7558c02d2ad197112827a02e1fc9b109d2302eb9 Mon Sep 17 00:00:00 2001 From: georgemoralis Date: Thu, 11 May 2023 15:40:12 +0300 Subject: [PATCH 4/6] Update windows.yml trying to fix artifact part2 --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 074685ed..defe893d 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -42,5 +42,5 @@ jobs: name: shadps4-win64 # A file, directory or wildcard pattern that describes what to upload path: | - out/build/x64/Release/shadps4.exe - out/build/x64/Release/SDL3.dll + ${{github.workspace}}/out/build/x64/Release/shadps4.exe + ${{github.workspace}}/out/build/x64/Release/SDL3.dll From 88bf9acd8aa07fc88699b3d2126f2ecfe71aa1be Mon Sep 17 00:00:00 2001 From: georgemoralis Date: Thu, 11 May 2023 15:53:05 +0300 Subject: [PATCH 5/6] Update windows.yml fixing artifact part3 --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index defe893d..075d8973 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -42,5 +42,5 @@ jobs: name: shadps4-win64 # A file, directory or wildcard pattern that describes what to upload path: | - ${{github.workspace}}/out/build/x64/Release/shadps4.exe - ${{github.workspace}}/out/build/x64/Release/SDL3.dll + ${{github.workspace}}/out/build/Release/shadps4.exe + ${{github.workspace}}/out/build/Release/SDL3.dll From 488c43be8ed39914caa93a0869ed7f36e76526ec Mon Sep 17 00:00:00 2001 From: georgemoralis Date: Thu, 11 May 2023 16:01:53 +0300 Subject: [PATCH 6/6] Update windows.yml fixing artifact part4 --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 075d8973..48d12b2b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -42,5 +42,5 @@ jobs: name: shadps4-win64 # A file, directory or wildcard pattern that describes what to upload path: | - ${{github.workspace}}/out/build/Release/shadps4.exe - ${{github.workspace}}/out/build/Release/SDL3.dll + ${{github.workspace}}/build/Release/shadps4.exe + ${{github.workspace}}/build/Release/SDL3.dll