Skip to content

Commit

Permalink
chore: Update vcpkg version (endless-sky#10696)
Browse files Browse the repository at this point in the history
  • Loading branch information
TomGoodIdea authored Nov 3, 2024
1 parent c25fda4 commit 60f2a1f
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- uses: lukka/get-cmake@latest
- uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: '2cf957350da28ad032178a974607f59f961217d9'
vcpkgGitCommitId: 'c82f74667287d3dc386bce81e44964370c91a289'
- uses: lukka/run-cmake@v10
with:
configurePreset: 'linux-release'
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
- uses: lukka/get-cmake@latest
- uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: '2cf957350da28ad032178a974607f59f961217d9'
vcpkgGitCommitId: 'c82f74667287d3dc386bce81e44964370c91a289'
- uses: lukka/run-cmake@v10
with:
configurePreset: 'mingw-release'
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
- uses: lukka/get-cmake@latest
- uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: '2cf957350da28ad032178a974607f59f961217d9'
vcpkgGitCommitId: 'c82f74667287d3dc386bce81e44964370c91a289'
- uses: lukka/run-cmake@v10
with:
configurePreset: 'macos-release'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/cd_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- uses: lukka/get-cmake@latest
- uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: '2cf957350da28ad032178a974607f59f961217d9'
vcpkgGitCommitId: 'c82f74667287d3dc386bce81e44964370c91a289'
- uses: lukka/run-cmake@v10
with:
configurePreset: 'linux-release'
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
- uses: lukka/get-cmake@latest
- uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: '2cf957350da28ad032178a974607f59f961217d9'
vcpkgGitCommitId: 'c82f74667287d3dc386bce81e44964370c91a289'
- uses: lukka/run-cmake@v10
with:
configurePreset: 'mingw-release'
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
- uses: lukka/get-cmake@latest
- uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: '2cf957350da28ad032178a974607f59f961217d9'
vcpkgGitCommitId: 'c82f74667287d3dc386bce81e44964370c91a289'
- uses: lukka/run-cmake@v10
with:
configurePreset: 'macos-arm-release'
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
- name: Install development dependencies
run: |
sudo apt-get update
sudo apt-get install -y --no-install-recommends libxmu-dev libxi-dev libgl-dev libglu1-mesa-dev libgles2-mesa-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev libosmesa6 mesa-utils libglvnd-dev x11-utils catch2
sudo apt-get install -y --no-install-recommends libxmu-dev libxi-dev libgl-dev libglu1-mesa-dev libgles2-mesa-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev libosmesa6 mesa-utils libglvnd-dev x11-utils catch2 libltdl-dev
- name: Disable VM sound card
run: |
sudo sh -c 'echo "pcm.!default { type plug slave.pcm \"null\" }" >> /etc/asound.conf'
Expand All @@ -77,7 +77,7 @@ jobs:
- uses: lukka/get-cmake@latest
- uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: '2cf957350da28ad032178a974607f59f961217d9'
vcpkgGitCommitId: 'c82f74667287d3dc386bce81e44964370c91a289'
- uses: lukka/run-cmake@v10
with:
configurePreset: ${{ matrix.opengl == 'GL' && 'linux-ci' || 'linux-gles-ci' }}
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
- uses: lukka/get-cmake@latest
- uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: '2cf957350da28ad032178a974607f59f961217d9'
vcpkgGitCommitId: 'c82f74667287d3dc386bce81e44964370c91a289'
- uses: lukka/run-cmake@v10
with:
configurePreset: 'mingw-ci'
Expand Down Expand Up @@ -183,7 +183,7 @@ jobs:
- uses: lukka/get-cmake@latest
- uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: '2cf957350da28ad032178a974607f59f961217d9'
vcpkgGitCommitId: 'c82f74667287d3dc386bce81e44964370c91a289'
- uses: lukka/run-cmake@v10
with:
configurePreset: 'clang-cl-ci'
Expand Down Expand Up @@ -218,7 +218,7 @@ jobs:
- uses: lukka/get-cmake@latest
- uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: '2cf957350da28ad032178a974607f59f961217d9'
vcpkgGitCommitId: 'c82f74667287d3dc386bce81e44964370c91a289'
- uses: lukka/run-cmake@v10
with:
configurePreset: 'macos-ci'
Expand Down
2 changes: 1 addition & 1 deletion vcpkg-configuration.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"default-registry": {
"kind": "builtin",
"baseline": "2cf957350da28ad032178a974607f59f961217d9"
"baseline": "c82f74667287d3dc386bce81e44964370c91a289"
},
"overlay-triplets": [ "./overlays" ]
}

0 comments on commit 60f2a1f

Please sign in to comment.