diff --git a/.github/workflows/aseprite_build_deploy.yml b/.github/workflows/aseprite_build_deploy.yml index 91ec17c..add6164 100644 --- a/.github/workflows/aseprite_build_deploy.yml +++ b/.github/workflows/aseprite_build_deploy.yml @@ -73,6 +73,10 @@ jobs: - name: (Windows) Install dependencies if: matrix.os == 'windows-latest' uses: seanmiddleditch/gha-setup-ninja@v3 + - name: (Windows) Remove OpenSLL from PATH + if: matrix.os == 'windows-latest' + shell: powershell + run: Remove-Item -Recurse -Force "C:\Program Files\OpenSSL\" - name: (Ubuntu) Install dependencies if: matrix.os == 'ubuntu-latest' run: sudo apt update && sudo apt install -y cmake ninja-build libxcursor-dev libxi-dev libgl1-mesa-dev @@ -111,7 +115,7 @@ jobs: if: matrix.os == 'windows-latest' working-directory: aseprite/build shell: cmd - run: cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DCMAKE_IGNORE_PATH='C:/ProgramData/chocolatey/bin/;C:/Strawberry/c/bin/' -DLAF_BACKEND=skia -DSKIA_DIR=../../skia -DSKIA_LIBRARY_DIR=../../skia/out/Release-x64 -G Ninja .. + run: cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DCMAKE_IGNORE_PATH='C:/ProgramData/chocolatey/bin/;C:/Strawberry/c/bin/' -DLAF_BACKEND=skia -DSKIA_DIR=../../skia -DSKIA_LIBRARY_DIR=../../skia/out/Release-x64 -DSKIA_LIBRARY=../../skia/out/Release-x64/skia.lib -G Ninja .. - name: (Ubuntu) Run CMake if: matrix.os == 'ubuntu-latest' working-directory: aseprite/build @@ -141,4 +145,4 @@ jobs: upload_url: ${{ needs.check-version.outputs.upload_url }} asset_path: aseprite/build/bin/Aseprite-${{ needs.check-version.outputs.latest_tag }}-${{ runner.os }}.zip asset_name: Aseprite-${{ needs.check-version.outputs.latest_tag }}-${{ runner.os }}.zip - asset_content_type: application/zip + asset_content_type: application/zip \ No newline at end of file