diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 0eda0762..9a676aa1 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -57,7 +57,7 @@ jobs: if: matrix.os == 'windows-latest' run: | $ErrorActionPreference = 'silentlyContinue' - build-deps.ps1 -Arg1 x64 -Arg2 $false + ./build-deps.ps1 -Arg1 x64 if ((Test-Path -LiteralPath variable:\LASTEXITCODE)) { exit $LASTEXITCODE } shell: powershell -Command "& '{0}'" - name: Setup Dependencies Linux/MacOS @@ -67,7 +67,7 @@ jobs: git clone https://github.com/Thealexbarney/LibAtrac9.git --depth 1 cd LibAtrac9/C if [ "${{ matrix.os_name }}" == 'macos' ]; then - sed -i 's/,--version-script=libatrac9.version//g' Makefile + sed -i '' -e 's/,--version-script=libatrac9.version//g' Makefile fi make mkdir -p ../include/libatrac9 @@ -76,7 +76,7 @@ jobs: cp src/libatrac9.h ../include/libatrac9/ popd # echo "LIBATRAC9DIR=vendor/LibAtrac9" >> $GITHUB_ENV - - run: sudo apt-get install nasm + - run: sudo apt-get install nasm libx11-dev libxft-dev libxext-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev libibus-1.0-dev if: matrix.os == 'ubuntu-latest' - name: Run CMake with vcpkg.json manifest uses: lukka/run-cmake@v10 @@ -91,10 +91,10 @@ jobs: - name: Archive Artifacts run: 7z u impacto-${{ matrix.os_name }}-${{ steps.version.outputs.version }}-${{ github.sha }}.zip release/x64-Release - if: startsWith(github.ref, 'refs/tags') || (github.ref == 'refs/heads/master') + # if: startsWith(github.ref, 'refs/tags') || (github.ref == 'refs/heads/master') - name: Upload Artifact uses: actions/upload-artifact@v4.1.0 - if: startsWith(github.ref, 'refs/tags') || (github.ref == 'refs/heads/master') + # if: startsWith(github.ref, 'refs/tags') || (github.ref == 'refs/heads/master') with: path: impacto-${{ matrix.os_name }}-${{ steps.version.outputs.version }}-${{ github.sha }}.zip name: release-${{ matrix.os_name }} @@ -107,7 +107,7 @@ jobs: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} needs: - job-matrix - if: ((${{needs.job-matrix.result}} == "success") && (github.ref == 'refs/heads/master')) + if: ((${{needs.job-matrix.result}} == "success")) steps: - uses: actions/download-artifact@v4 with: diff --git a/CMakePresets.json b/CMakePresets.json index 1ca865fc..93f33f11 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -26,7 +26,8 @@ "installDir": "release/${presetName}", "toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake", "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release" + "CMAKE_BUILD_TYPE": "Release", + "VCPKG_BUILD_TYPE": "release" } } ],