Skip to content

Commit 889a55b

Browse files
committed
github-actions/win32: don't install everything on vcpkg + bump vcpkg helper to v4
1 parent bc3e2a8 commit 889a55b

File tree

6 files changed

+15
-12
lines changed

6 files changed

+15
-12
lines changed

.github/workflows/build.msvc.windows.workflow.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,14 @@ jobs:
9494
- name: Set vcpkg's response file path used as part of cache's key.
9595
uses: lukka/set-shell-env@master
9696
with:
97-
VCPKGRESPONSEFILE: ${{ github.workspace }}/.github/workflows/msvc.windows.vcpkg.txt
97+
VCPKGRESPONSEFILE: ${{ github.workspace }}/.github/workflows/vcpkg/msvc.windows.${{ matrix.arch }}.${{ matrix.linking }}.vcpkg.txt
9898
filter: ^VCPKG.*
9999

100100
# Restore from cache the previously built ports. If cache-miss, download, build vcpkg.
101101
# Then install libarchive + libpng-apng for all targets.
102102
- name: Restore from cache and install vcpkg + libraries (libarchive, libpng-apng)
103103
# Download and build vcpkg, without installing any port. If content is cached already, it is a no-op.
104-
uses: lukka/run-vcpkg@v3
104+
uses: lukka/run-vcpkg@v4
105105
with:
106106
vcpkgArguments: '@${{ env.VCPKGRESPONSEFILE }}'
107107
# This commit ID corresponds to 2020.06
@@ -160,7 +160,7 @@ jobs:
160160
- name: Install vcpkg integration (${{ matrix.arch_name }})
161161
run: ${{ env.VCPKG_ROOT }}/vcpkg integrate install
162162

163-
# 32-bit dynamic + static builds
163+
# Debug and release builds
164164
- name: "Build target: ${{ matrix.linking_name }} (Debug, ${{ matrix.arch_name }})"
165165
shell: cmd
166166
run: |

.github/workflows/msvc.windows.vcpkg.txt

Lines changed: 0 additions & 9 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
libarchive:x64-windows
2+
libpng[core,apng]:x64-windows
3+
--recurse
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
libarchive:x64-windows-static
2+
libpng[core,apng]:x64-windows-static
3+
--recurse
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
libarchive:x86-windows
2+
libpng[core,apng]:x86-windows
3+
--recurse
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
libarchive:x86-windows-static
2+
libpng[core,apng]:x86-windows-static
3+
--recurse

0 commit comments

Comments
 (0)