From acdbfeeff0a15bf1fd8d9669de82483142af0704 Mon Sep 17 00:00:00 2001 From: Louis Moureaux Date: Fri, 15 Dec 2023 02:33:42 +0100 Subject: [PATCH] Update the vcpkg version hash Also remove broken debugging code from the macOS build config. See #2075. --- .github/workflows/build.yaml | 7 +------ vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f75961a032..e8df27e7a0 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -225,7 +225,7 @@ jobs: - uses: lukka/run-vcpkg@v10 name: Install dependencies with: - vcpkgGitCommitId: 50fd3d9957195575849a49fa591e645f1d8e7156 + vcpkgGitCommitId: 23ceb9cbf9b6d32f485cf039547b70102a6ef9d8 - name: Build uses: lukka/run-cmake@v10 with: @@ -264,11 +264,6 @@ jobs: "Freeciv21-${{steps.split.outputs.fragment}}.dmg" \ "staging/" shasum -a 256 Freeciv21-${{steps.split.outputs.fragment}}.dmg > Freeciv21-${{steps.split.outputs.fragment}}.dmg.sha256 - - name: Debug - if: failure() - run: | - cat CMakeCache.txt - echo ${{steps.split.outputs.fragment}} - name: Upload package uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/') diff --git a/vcpkg.json b/vcpkg.json index 507b4a9b86..a1d83044c0 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "name": "freeciv21", "version-string": "3.0.0", - "builtin-baseline": "50fd3d9957195575849a49fa591e645f1d8e7156", + "builtin-baseline": "23ceb9cbf9b6d32f485cf039547b70102a6ef9d8", "dependencies": [ "qt5-base", "qt5-svg",