Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: Fix MSVC builds while preserving PRs' CMake build #5934

Merged
merged 2 commits into from
Jan 17, 2025
+17 −29
Merged

build: Fix MSVC builds while preserving PRs' CMake build #5934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7853d0
Base commits
RobbieNeko Jan 17, 2025
2966e3e
PIN
RobbieNeko Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .github/workflows/manual-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,6 @@ jobs:
appendedCacheKey: ${{ hashFiles( 'msvc-full-features/vcpkg.json', '.github/vcpkg_triplets/**' ) }}-${{ matrix.arch }}-1
setupOnly: true
vcpkgDirectory: "${{ runner.workspace }}/b/vcpkg"
# We have to use at least this version of vcpkg to include fixes for
# various issues we've encountered over time. Keep it in sync with the builtin-baseline
# field in vcpkg.json. Caching happens as a post-action which runs at the end of
# the whole workflow, after vcpkg install happens during msbuild run.
vcpkgGitCommitId: "66444e13a86da7087ee24c342f91801cc6eb9877"
- name: Install dependencies (windows msvc) (3/3)
if: runner.os == 'Windows'
run: |
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/msvc-full-features-cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,10 @@ jobs:
uses: lukka/get-cmake@latest

- name: Install vcpkg
uses: lukka/run-vcpkg@v11
uses: lukka/run-vcpkg@main
id: runvcpkg
with:
vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
vcpkgGitCommitId: "66444e13a86da7087ee24c342f91801cc6eb9877"

- name: Integrate vcpkg
run: |
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,11 +225,10 @@ jobs:
uses: lukka/get-cmake@latest

- name: Install vcpkg
uses: lukka/run-vcpkg@v11
uses: lukka/run-vcpkg@main
id: runvcpkg
with:
vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
vcpkgGitCommitId: "66444e13a86da7087ee24c342f91801cc6eb9877"

- name: Integrate vcpkg
if: runner.os == 'Windows'
Expand Down
35 changes: 15 additions & 20 deletions msvc-full-features/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
{
"name": "bn-vcpkg-dependencies",
"version-string": "experimental",
"dependencies": [
"sdl2",
{
"name": "sdl2-image",
"features": [ "libjpeg-turbo" ]
},
{
"name": "sdl2-mixer",
"features": [ "libflac", "mpg123", "libmodplug" ]
},
"sdl2-ttf"
],
"builtin-baseline": "c9aba300923c8ec0ab190e2bff23085209925c97",
"vcpkg-configuration": {
"overlay-ports": [
"../.github/vcpkg_ports"
]
}
"name": "bn-vcpkg-dependencies",
"version-string": "experimental",
"dependencies": [
"sdl2",
{ "name": "sdl2-image", "features": [ "libjpeg-turbo" ] },
{ "name": "sdl2-mixer", "features": [ "libflac", "mpg123", "libmodplug" ] },
"sdl2-ttf"
],
"builtin-baseline": "b322364f06308bdd24823f9d8f03fe0cc86fd46f",
"overrides": [
{ "name": "sdl2-mixer", "version": "2.6.3#1" }
],
"vcpkg-configuration": {
"overlay-ports": [ "../.github/vcpkg_ports" ]
}
}
Loading