diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index dfdfbf0371be8..431752692c212 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -281,30 +281,16 @@ jobs: id: key shell: powershell run: | - # Work around caching failure with GNU tar - New-Item -Type Junction -Path vcpkg -Target c:\vcpkg - Write-Output "image=$env:ImageOS-$env:ImageVersion" >> $env:GITHUB_OUTPUT - name: Enable vcpkg cache uses: actions/cache@v3 with: - path: vcpkg/installed + path: build/vcpkg_installed key: ${{ steps.key.outputs.image }}-vcpkg-${{ matrix.arch }}-1 # Increase the number whenever dependencies are modified restore-keys: | ${{ steps.key.outputs.image }}-vcpkg-${{ matrix.arch }} - - name: Prepare vcpkg - shell: bash - run: | - vcpkg install --triplet=${{ matrix.arch }}-windows-static \ - breakpad \ - liblzma \ - libpng \ - lzo \ - zlib \ - # EOF - - name: Install OpenGFX shell: bash run: | diff --git a/vcpkg.json b/vcpkg.json new file mode 100644 index 0000000000000..4c0020f63baba --- /dev/null +++ b/vcpkg.json @@ -0,0 +1,25 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", + "dependencies": [ + { + "name": "breakpad", + "platform": "(windows & static) & (x86 | x64)" + }, + { + "name": "liblzma", + "platform": "(windows & static) & (x86 | x64 | arm64)" + }, + { + "name": "libpng", + "platform": "(windows & static) & (x86 | x64 | arm64)" + }, + { + "name": "lzo", + "platform": "(windows & static) & (x86 | x64 | arm64)" + }, + { + "name": "zlib", + "platform": "(windows & static) & (x86 | x64 | arm64)" + } + ] +}