@@ -17,12 +17,15 @@ jobs:
1717 - platform : msvc-x64
1818 triplet : x64-windows
1919 runner : windows-latest
20+ overlay : vcmi-overlay-boost
2021 - platform : msvc-x86
2122 triplet : x86-windows
2223 runner : windows-latest
24+ overlay : vcmi-overlay-boost
2325 - platform : msvc-arm64
2426 triplet : arm64-windows
2527 runner : windows-11-arm
28+ overlay : vcmi-overlay-yasm
2629
2730 runs-on : ${{ matrix.runner }}
2831 defaults :
7780
7881 - name : Install dependencies
7982 run : |
80- if [ "${{ matrix.platform }}" == "msvc-arm64" ]; then
81- ./vcpkg.exe install yasm --triplet "${{ matrix.triplet }}" --overlay-ports=vcmi-overlay-yasm
82- OVERLAY="--overlay-ports=vcmi-overlay-yasm"
83- else
84- ./vcpkg.exe install yasm --triplet "${{ matrix.triplet }}" --overlay-ports=vcmi-overlay-boost
85- OVERLAY="--overlay-ports=vcmi-overlay-boost"
86- fi
87-
83+ ./vcpkg.exe install yasm --triplet "${{ matrix.triplet }}" --overlay-ports=${{ matrix.overlay }}
84+
8885 ./vcpkg.exe install \
8986 tbb fuzzylite sdl2 sdl2-image sdl2-ttf sdl2-mixer[core,mpg123] \
9087 qt5-base qt5-tools \
@@ -93,23 +90,19 @@ jobs:
9390 boost-iostreams boost-headers boost-foreach boost-format boost-crc boost-logic \
9491 boost-multi-array boost-ptr-container boost-heap boost-bimap boost-asio \
9592 boost-stacktrace boost-assign boost-geometry boost-uuid boost-process \
96- --triplet "${{ matrix.triplet }}" $OVERLAY
93+ --triplet "${{ matrix.triplet }}" \
94+ --overlay-ports=${{ matrix.overlay }}
9795
9896 - name : Export packages
9997 run : |
100- if [ "${{ matrix.platform }}" == "msvc-arm64" ]; then
101- OVERLAY="--overlay-ports=vcmi-overlay-yasm"
102- else
103- OVERLAY="--overlay-ports=vcmi-overlay-boost"
104- fi
105-
10698 ./vcpkg.exe export \
10799 tbb fuzzylite sdl2 sdl2-image sdl2-ttf sdl2-mixer qt5-base qt5-tools ffmpeg \
108100 boost-filesystem boost-system boost-thread boost-program-options boost-locale \
109101 boost-iostreams boost-headers boost-foreach boost-format boost-crc boost-logic \
110102 boost-multi-array boost-ptr-container boost-heap boost-bimap boost-asio \
111103 boost-stacktrace boost-assign boost-geometry boost-uuid boost-process \
112- --raw --triplet "${{ matrix.triplet }}" $OVERLAY \
104+ --raw --triplet "${{ matrix.triplet }}" \
105+ --overlay-ports=${{ matrix.overlay }} \
113106 --output=result/vcpkg
114107
115108 - name : Trim pdb files
0 commit comments