Skip to content

Commit

Permalink
Codechange: [VCPKG] Switch to manifest mode
Browse files Browse the repository at this point in the history
  • Loading branch information
glx22 committed Oct 4, 2023
1 parent 7145b70 commit 5f6a3d4
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 15 deletions.
16 changes: 1 addition & 15 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
25 changes: 25 additions & 0 deletions vcpkg.json
Original file line number Diff line number Diff line change
@@ -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)"
}
]
}

0 comments on commit 5f6a3d4

Please sign in to comment.