Use up-to-date dependencies #8
Merged
+38
−13
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Comment on lines
85
to
91
| if [ "${{ matrix.platform }}" == "msvc-arm64" ]; then | ||
| ./vcpkg.exe install yasm --triplet "${{ matrix.triplet }}" --overlay-ports=vcmi-overlay-yasm | ||
| OVERLAY="--overlay-ports=vcmi-overlay-yasm" | ||
| else | ||
| ./vcpkg.exe install yasm --triplet "${{ matrix.triplet }}" --overlay-ports=vcmi-overlay-boost | ||
| OVERLAY="--overlay-ports=vcmi-overlay-boost" | ||
| fi |
There was a problem hiding this comment.
Suggested change
| if [ "${{ matrix.platform }}" == "msvc-arm64" ]; then | |
| ./vcpkg.exe install yasm --triplet "${{ matrix.triplet }}" --overlay-ports=vcmi-overlay-yasm | |
| OVERLAY="--overlay-ports=vcmi-overlay-yasm" | |
| else | |
| ./vcpkg.exe install yasm --triplet "${{ matrix.triplet }}" --overlay-ports=vcmi-overlay-boost | |
| OVERLAY="--overlay-ports=vcmi-overlay-boost" | |
| fi | |
| if [ "${{ matrix.platform }}" == "msvc-arm64" ]; then | |
| OVERLAY="--overlay-ports=vcmi-overlay-yasm" | |
| else | |
| OVERLAY="--overlay-ports=vcmi-overlay-boost" | |
| fi | |
| ./vcpkg.exe install yasm --triplet "${{ matrix.triplet }}" $OVERLAY |
There was a problem hiding this comment.
you can also put OVERLAY to GITHUB_ENV to avoid computing it again in Export packages
There was a problem hiding this comment.
Or we can give overlays fixed name, vcmi-overlay or whatever and instead add packages to overlay using architecture as condition - one step for arm64 /yasm & another for boost/amd64.
So on arm64 vcmi-overlay will contain yasm, and on amd64 - vcmi-overlay will contain boost.
With this there won't be need for OVERLAY variable
|
Workflow is simplified now. |
kambala-decapitator
approved these changes
Aug 1, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Improved building mechanism to use overlays for required components.
Now are used latest packages except Boost for Windows 7 and YASM for ARM64 dependencies.