@@ -17,40 +17,61 @@ jobs:
17
17
- platform : msvc-x64
18
18
triplet : x64-windows
19
19
runner : windows-latest
20
- # commit before addition of boost filesystem 1.87 that removes Win7 support https://github.com/microsoft/vcpkg/pull/42678
21
- commit : ec12d917a85839741f8345905f71b3e7f56d9ddc
20
+ overlay : vcmi-overlay-boost
22
21
- platform : msvc-x86
23
22
triplet : x86-windows
24
23
runner : windows-latest
25
- # commit before addition of boost filesystem 1.87 that removes Win7 support https://github.com/microsoft/vcpkg/pull/42678
26
- commit : ec12d917a85839741f8345905f71b3e7f56d9ddc
24
+ overlay : vcmi-overlay-boost
27
25
- platform : msvc-arm64
28
26
triplet : arm64-windows
29
27
runner : windows-11-arm
30
- # commit before changes to yasm package which seems to break ARM builds https://github.com/microsoft/vcpkg/pull/45856
31
- commit : 94a9df6990e426ec3fff1a4ba20016da4aafea70
28
+ overlay : vcmi-overlay-yasm
32
29
33
30
runs-on : ${{ matrix.runner }}
34
31
defaults :
35
32
run :
36
33
shell : bash
37
34
38
35
steps :
39
- - name : Checkout vcpkg repository
36
+ # Use latest vcpkg for x64/x86
37
+ - name : Checkout vcpkg (latest)
40
38
uses : actions/checkout@v4
41
39
with :
42
40
repository : ' microsoft/vcpkg'
43
- ref : ${{ matrix.commit }}
41
+ ref : master
42
+
43
+ - name : Prepare overlays (Boost + YASM)
44
+ run : |
45
+ mkdir -p vcmi-overlay-boost vcmi-overlay-yasm
46
+
47
+ # Boost overlay (Win7 fix)
48
+ # Commit before addition of boost filesystem 1.87 that removes Win7 support:
49
+ # https://github.com/microsoft/vcpkg/pull/42678
50
+ # Commit: ec12d917a85839741f8345905f71b3e7f56d9ddc
51
+ git fetch origin ec12d917a85839741f8345905f71b3e7f56d9ddc
52
+ git checkout ec12d917a85839741f8345905f71b3e7f56d9ddc
53
+ cp -r ports/boost* vcmi-overlay-boost/
54
+
55
+ # YASM overlay (ARM64 fix)
56
+ # Commit before changes to yasm package which seem to break ARM builds:
57
+ # https://github.com/microsoft/vcpkg/pull/45856
58
+ # Commit: 94a9df6990e426ec3fff1a4ba20016da4aafea70
59
+ git fetch origin 94a9df6990e426ec3fff1a4ba20016da4aafea70
60
+ git checkout 94a9df6990e426ec3fff1a4ba20016da4aafea70
61
+ cp -r ports/yasm* vcmi-overlay-yasm/
62
+
63
+ # Switch back to master for the rest of the ports
64
+ git checkout master
44
65
45
66
# NOTE: disabling debug for all triplets, so 64 host / 32 guest won't build debug version of 64-bit tools
46
- # Othervice , x86 package size is way larger than needed
67
+ # Otherwise , x86 package size is way larger than needed
47
68
- name : Disable debug builds
48
69
run : |
49
70
echo 'set(VCPKG_BUILD_TYPE release)' >>triplets/x64-windows.cmake
50
71
echo 'set(VCPKG_BUILD_TYPE release)' >>triplets/x86-windows.cmake
51
72
echo 'set(VCPKG_BUILD_TYPE release)' >>triplets/arm64-windows.cmake
52
73
53
- - name : Enable Windows 7 targeting (only for x86/x64)
74
+ - name : Enable Windows 7 targeting (x86/x64)
54
75
if : matrix.triplet == 'x64-windows' || matrix.triplet == 'x86-windows'
55
76
run : |
56
77
echo 'set(VCPKG_CXX_FLAGS "-D_WIN32_WINNT=0x0601 -DWINVER=0x0601")' >>triplets/${{ matrix.triplet }}.cmake
61
82
62
83
- name : Install dependencies
63
84
run : |
64
- ./vcpkg.exe install yasm --triplet "${{ matrix.triplet }}"
85
+ ./vcpkg.exe install yasm --triplet "${{ matrix.triplet }}" --overlay-ports=${{ matrix.overlay }}
86
+
65
87
./vcpkg.exe install \
66
88
tbb fuzzylite sdl2 sdl2-image sdl2-ttf sdl2-mixer[core,mpg123] \
67
89
qt5-base qt5-tools \
70
92
boost-iostreams boost-headers boost-foreach boost-format boost-crc boost-logic \
71
93
boost-multi-array boost-ptr-container boost-heap boost-bimap boost-asio \
72
94
boost-stacktrace boost-assign boost-geometry boost-uuid boost-process \
73
- --triplet "${{ matrix.triplet }}"
95
+ --triplet "${{ matrix.triplet }}" \
96
+ --overlay-ports=${{ matrix.overlay }}
74
97
75
98
- name : Export packages
76
99
run : |
80
103
boost-iostreams boost-headers boost-foreach boost-format boost-crc boost-logic \
81
104
boost-multi-array boost-ptr-container boost-heap boost-bimap boost-asio \
82
105
boost-stacktrace boost-assign boost-geometry boost-uuid boost-process \
83
- --raw --triplet "${{ matrix.triplet }}" --output=result/vcpkg
106
+ --raw --triplet "${{ matrix.triplet }}" \
107
+ --overlay-ports=${{ matrix.overlay }} \
108
+ --output=result/vcpkg
84
109
85
110
- name : Trim pdb files
86
111
run : |
0 commit comments