@@ -41,29 +41,27 @@ jobs:
4141 run : |
4242 mkdir -p vcmi-overlay-boost vcmi-overlay-yasm
4343
44- # Boost overlay (Win7 fix)
45- # Commit before addition of boost filesystem 1.87 that removes Win7 support https://github.com/microsoft/vcpkg/pull/42678
46- # commit: ec12d917a85839741f8345905f71b3e7f56d9ddc
44+ # Clone vcpkg once
45+ git clone https://github.com/microsoft/vcpkg.git temp-vcpkg
46+ cd temp-vcpkg
4747
48- git clone --depth=1 https://github.com/microsoft/vcpkg.git temp-vcpkg-boost
49- cd temp-vcpkg-boost
50- git fetch origin ec12d917a85839741f8345905f71b3e7f56d9ddc
48+ # Boost overlay (Win7 fix)
49+ # Commit before addition of boost filesystem 1.87 that removes Win7 support:
50+ # https://github.com/microsoft/vcpkg/pull/42678
51+ # Commit: ec12d917a85839741f8345905f71b3e7f56d9ddc
5152 git checkout ec12d917a85839741f8345905f71b3e7f56d9ddc
5253 cp -r ports/boost* ../vcmi-overlay-boost/
53- cd ..
54- rm -rf temp-vcpkg-boost
5554
5655 # YASM overlay (ARM64 fix)
57- # commit before changes to yasm package which seems to break ARM builds https://github.com/microsoft/vcpkg/pull/45856
58- # commit: 94a9df6990e426ec3fff1a4ba20016da4aafea70
59-
60- git clone --depth=1 https://github.com/microsoft/vcpkg.git temp-vcpkg-yasm
61- cd temp-vcpkg-yasm
62- git fetch origin 94a9df6990e426ec3fff1a4ba20016da4aafea70
56+ # Commit before changes to yasm package which seem to break ARM builds:
57+ # https://github.com/microsoft/vcpkg/pull/45856
58+ # Commit: 94a9df6990e426ec3fff1a4ba20016da4aafea70
6359 git checkout 94a9df6990e426ec3fff1a4ba20016da4aafea70
6460 cp -r ports/yasm* ../vcmi-overlay-yasm/
61+
62+ # Switch back to master for the rest of the ports
63+ git checkout master
6564 cd ..
66- rm -rf temp-vcpkg-yasm
6765
6866 # NOTE: disabling debug for all triplets, so 64 host / 32 guest won't build debug version of 64-bit tools
6967 # Otherwise, x86 package size is way larger than needed
0 commit comments