Skip to content

Commit cc875dc

Browse files
authored
Use up-to-date dependencies (#8)
Improved building mechanism to use overlays for required components. Now are used latest packages except Boost for Windows 7 and YASM for ARM64 dependencies.
1 parent 92666eb commit cc875dc

File tree

1 file changed

+38
-13
lines changed

1 file changed

+38
-13
lines changed

.github/workflows/rebuildDependencies.yml

Lines changed: 38 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,40 +17,61 @@ jobs:
1717
- platform: msvc-x64
1818
triplet: x64-windows
1919
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
2221
- platform: msvc-x86
2322
triplet: x86-windows
2423
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
2725
- platform: msvc-arm64
2826
triplet: arm64-windows
2927
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
3229

3330
runs-on: ${{ matrix.runner }}
3431
defaults:
3532
run:
3633
shell: bash
3734

3835
steps:
39-
- name: Checkout vcpkg repository
36+
# Use latest vcpkg for x64/x86
37+
- name: Checkout vcpkg (latest)
4038
uses: actions/checkout@v4
4139
with:
4240
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
4465
4566
# 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
4768
- name: Disable debug builds
4869
run: |
4970
echo 'set(VCPKG_BUILD_TYPE release)' >>triplets/x64-windows.cmake
5071
echo 'set(VCPKG_BUILD_TYPE release)' >>triplets/x86-windows.cmake
5172
echo 'set(VCPKG_BUILD_TYPE release)' >>triplets/arm64-windows.cmake
5273
53-
- name: Enable Windows 7 targeting (only for x86/x64)
74+
- name: Enable Windows 7 targeting (x86/x64)
5475
if: matrix.triplet == 'x64-windows' || matrix.triplet == 'x86-windows'
5576
run: |
5677
echo 'set(VCPKG_CXX_FLAGS "-D_WIN32_WINNT=0x0601 -DWINVER=0x0601")' >>triplets/${{ matrix.triplet }}.cmake
@@ -61,7 +82,8 @@ jobs:
6182

6283
- name: Install dependencies
6384
run: |
64-
./vcpkg.exe install yasm --triplet "${{ matrix.triplet }}"
85+
./vcpkg.exe install yasm --triplet "${{ matrix.triplet }}" --overlay-ports=${{ matrix.overlay }}
86+
6587
./vcpkg.exe install \
6688
tbb fuzzylite sdl2 sdl2-image sdl2-ttf sdl2-mixer[core,mpg123] \
6789
qt5-base qt5-tools \
@@ -70,7 +92,8 @@ jobs:
7092
boost-iostreams boost-headers boost-foreach boost-format boost-crc boost-logic \
7193
boost-multi-array boost-ptr-container boost-heap boost-bimap boost-asio \
7294
boost-stacktrace boost-assign boost-geometry boost-uuid boost-process \
73-
--triplet "${{ matrix.triplet }}"
95+
--triplet "${{ matrix.triplet }}" \
96+
--overlay-ports=${{ matrix.overlay }}
7497

7598
- name: Export packages
7699
run: |
@@ -80,7 +103,9 @@ jobs:
80103
boost-iostreams boost-headers boost-foreach boost-format boost-crc boost-logic \
81104
boost-multi-array boost-ptr-container boost-heap boost-bimap boost-asio \
82105
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
84109
85110
- name: Trim pdb files
86111
run: |

0 commit comments

Comments
 (0)