From ccd7fae9bd136e4922f0e0c00edc1cc8e8dd0ff1 Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 30 Aug 2023 13:47:26 +0200 Subject: [PATCH] chore: Update all dependencies (#9243) --- .github/workflows/cd.yaml | 6 +++--- .github/workflows/cd_release.yaml | 8 ++++---- .github/workflows/ci.yml | 8 ++++---- vcpkg-configuration.json | 2 +- vcpkg.json | 10 +--------- 5 files changed, 13 insertions(+), 21 deletions(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 78f89b3ff542..e0c6db8671bd 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -37,7 +37,7 @@ jobs: - uses: lukka/get-cmake@latest - uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: '69efe9cc2df0015f0bb2d37d55acde4a75c9a25b' + vcpkgGitCommitId: '2cf957350da28ad032178a974607f59f961217d9' - uses: lukka/run-cmake@v10 with: configurePreset: 'linux-release' @@ -68,7 +68,7 @@ jobs: - uses: lukka/get-cmake@latest - uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: '69efe9cc2df0015f0bb2d37d55acde4a75c9a25b' + vcpkgGitCommitId: '2cf957350da28ad032178a974607f59f961217d9' - uses: lukka/run-cmake@v10 with: configurePreset: 'mingw-release' @@ -100,7 +100,7 @@ jobs: - uses: lukka/get-cmake@latest - uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: '69efe9cc2df0015f0bb2d37d55acde4a75c9a25b' + vcpkgGitCommitId: '2cf957350da28ad032178a974607f59f961217d9' - uses: lukka/run-cmake@v10 with: configurePreset: 'macos-release' diff --git a/.github/workflows/cd_release.yaml b/.github/workflows/cd_release.yaml index 209683795384..b390affe4c65 100644 --- a/.github/workflows/cd_release.yaml +++ b/.github/workflows/cd_release.yaml @@ -25,7 +25,7 @@ jobs: - uses: lukka/get-cmake@latest - uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: '69efe9cc2df0015f0bb2d37d55acde4a75c9a25b' + vcpkgGitCommitId: '2cf957350da28ad032178a974607f59f961217d9' - uses: lukka/run-cmake@v10 with: configurePreset: 'linux-release' @@ -51,7 +51,7 @@ jobs: - uses: lukka/get-cmake@latest - uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: '69efe9cc2df0015f0bb2d37d55acde4a75c9a25b' + vcpkgGitCommitId: '2cf957350da28ad032178a974607f59f961217d9' - uses: lukka/run-cmake@v10 with: configurePreset: 'mingw32-release' @@ -89,7 +89,7 @@ jobs: - uses: lukka/get-cmake@latest - uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: '69efe9cc2df0015f0bb2d37d55acde4a75c9a25b' + vcpkgGitCommitId: '2cf957350da28ad032178a974607f59f961217d9' - uses: lukka/run-cmake@v10 with: configurePreset: 'mingw-release' @@ -129,7 +129,7 @@ jobs: - uses: lukka/get-cmake@latest - uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: '69efe9cc2df0015f0bb2d37d55acde4a75c9a25b' + vcpkgGitCommitId: '2cf957350da28ad032178a974607f59f961217d9' - uses: lukka/run-cmake@v10 with: configurePreset: 'macos-arm-release' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 05e0a8df92e0..a7886e1df3ed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,7 +64,7 @@ jobs: - uses: lukka/get-cmake@latest - uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: '69efe9cc2df0015f0bb2d37d55acde4a75c9a25b' + vcpkgGitCommitId: '2cf957350da28ad032178a974607f59f961217d9' - uses: lukka/run-cmake@v10 with: configurePreset: ${{ matrix.opengl == 'GL' && 'linux-ci' || 'linux-gles-ci' }} @@ -88,7 +88,7 @@ jobs: - uses: lukka/get-cmake@latest - uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: '69efe9cc2df0015f0bb2d37d55acde4a75c9a25b' + vcpkgGitCommitId: '2cf957350da28ad032178a974607f59f961217d9' - uses: lukka/run-cmake@v10 with: configurePreset: 'mingw-ci' @@ -122,7 +122,7 @@ jobs: - uses: lukka/get-cmake@latest - uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: '69efe9cc2df0015f0bb2d37d55acde4a75c9a25b' + vcpkgGitCommitId: '2cf957350da28ad032178a974607f59f961217d9' - uses: lukka/run-cmake@v10 with: configurePreset: 'clang-cl-ci' @@ -148,7 +148,7 @@ jobs: - uses: lukka/get-cmake@latest - uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: '69efe9cc2df0015f0bb2d37d55acde4a75c9a25b' + vcpkgGitCommitId: '2cf957350da28ad032178a974607f59f961217d9' - uses: lukka/run-cmake@v10 with: configurePreset: 'macos-ci' diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index 52169f19ae49..bfa8cd2ce971 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -1,7 +1,7 @@ { "default-registry": { "kind": "builtin", - "baseline": "69efe9cc2df0015f0bb2d37d55acde4a75c9a25b" + "baseline": "2cf957350da28ad032178a974607f59f961217d9" }, "overlay-triplets": [ "./overlays" ] } diff --git a/vcpkg.json b/vcpkg.json index f3e43a42e5d2..8783567dbd61 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -23,15 +23,7 @@ ], "platform": "linux" }, - "sdl2", - { - "name": "sdl2", - "features": [ - "x11", - "wayland" - ], - "platform": "linux" - } + "sdl2" ] }, "flatpak-libs": {