From 1aaeca3c1d98b5ee54557febf2165473c5df6359 Mon Sep 17 00:00:00 2001 From: Justus Ranvier Date: Wed, 2 Aug 2023 11:11:43 -0500 Subject: [PATCH] * build macos 13 packages * upgrade vcpkg commit to 2023.07.21 Release --- .github/workflows/vcpkg.yml | 17 +++++++++++------ .../{macos-11 => macos-13}/.keep | 0 .../{windows-2019 => windows-2022}/.keep | 0 overlay | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) rename deps/vcpkg_installed/{macos-11 => macos-13}/.keep (100%) rename deps/vcpkg_installed/{windows-2019 => windows-2022}/.keep (100%) diff --git a/.github/workflows/vcpkg.yml b/.github/workflows/vcpkg.yml index a3f9878..ab6c4f9 100644 --- a/.github/workflows/vcpkg.yml +++ b/.github/workflows/vcpkg.yml @@ -9,16 +9,16 @@ jobs: strategy: fail-fast: false matrix: - platform: [macos-12, windows-2022] + platform: [macos-13, windows-2022] include: - - platform: macos-12 + - platform: macos-13 vcpkg: '/usr/local/share/vcpkg' - triplet: 'x64-osx-11' + triplet: 'x64-osx-13' - platform: windows-2022 vcpkg: 'C:\vcpkg' triplet: 'x64-windows' env: - VCPKG_COMMIT_ID: '501db0f17ef6df184fcdbfbe0f87cde2313b6ab1' + VCPKG_COMMIT_ID: '9d47b24eacbd1cd94f139457ef6cd35e5d92cc84' VCPKG_ROOT: '${{ matrix.vcpkg }}' VCPKG_INSTALLED_DIR: '${{ github.workspace }}/deps/vcpkg_installed/${{ matrix.platform }}' VCPKG_DEFAULT_TRIPLET: '${{ matrix.triplet }}' @@ -47,6 +47,11 @@ jobs: rm -rvf 'C:\tools\nginx-1.23.1' shell: bash continue-on-error: true + - name: Setup XCode + if: runner.os == 'macOS' + uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: 15-beta - name: Install missing dependencies run: | if [ "$RUNNER_OS" == "macOS" ]; then @@ -61,11 +66,11 @@ jobs: - name: Update cmake uses: lukka/get-cmake@latest - name: Run vcpkg - uses: lukka/run-vcpkg@v10 + uses: lukka/run-vcpkg@v11 with: vcpkgDirectory: '${{ env.VCPKG_ROOT }}' vcpkgGitCommitId: '${{ env.VCPKG_COMMIT_ID }}' - vcpkgJsonGlob: '**/vcpkg.json' + vcpkgJsonGlob: 'vcpkg.json' runVcpkgInstall: true - name: Compress packages run: | diff --git a/deps/vcpkg_installed/macos-11/.keep b/deps/vcpkg_installed/macos-13/.keep similarity index 100% rename from deps/vcpkg_installed/macos-11/.keep rename to deps/vcpkg_installed/macos-13/.keep diff --git a/deps/vcpkg_installed/windows-2019/.keep b/deps/vcpkg_installed/windows-2022/.keep similarity index 100% rename from deps/vcpkg_installed/windows-2019/.keep rename to deps/vcpkg_installed/windows-2022/.keep diff --git a/overlay b/overlay index e182512..992e4a8 160000 --- a/overlay +++ b/overlay @@ -1 +1 @@ -Subproject commit e182512ab6b065e7f23aa7ea0b274fe25ea0d331 +Subproject commit 992e4a882fbc375671d57bd89668886deca9ed44