diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 968adb52..3169d735 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -132,7 +132,7 @@ jobs: shell: pwsh run: | pip install conan - conan profile new default --detect + conan profile detect conan install ./source/ ` --remote conancenter ` --build missing ` @@ -161,6 +161,7 @@ jobs: shell: bash run: | cd build/ + cd Release/ cd bin/ objcopy --only-keep-debug supercell-wx supercell-wx.debug objcopy --strip-debug --strip-unneeded supercell-wx @@ -205,7 +206,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: supercell-wx-debug-${{ matrix.artifact_suffix }} - path: ${{ github.workspace }}/build/bin/*.pdb + path: ${{ github.workspace }}/build/Release/bin/*.pdb - name: Upload Artifacts (Linux) if: ${{ startsWith(matrix.os, 'ubuntu') }} @@ -220,8 +221,8 @@ jobs: with: name: supercell-wx-debug-${{ matrix.artifact_suffix }} path: | - ${{ github.workspace }}/build/bin/*.debug - ${{ github.workspace }}/build/lib/*.debug + ${{ github.workspace }}/build/Release/bin/*.debug + ${{ github.workspace }}/build/Release/lib/*.debug - name: Build Installer (Windows) if: matrix.os == 'windows-2022' diff --git a/.gitignore b/.gitignore index 9e6da487..7002668a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ CMakeLists.txt.user CMakeCache.txt CMakeFiles CMakeScripts +CMakeUserPresets.json Testing cmake_install.cmake install_manifest.txt