Skip to content

Commit

Permalink
* build macos 13 packages
Browse files Browse the repository at this point in the history
* upgrade vcpkg commit to 2023.07.21 Release
  • Loading branch information
justusranvier committed Aug 2, 2023
1 parent 196a0b1 commit 1aaeca3
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
17 changes: 11 additions & 6 deletions .github/workflows/vcpkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}'
Expand Down Expand Up @@ -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
Expand All @@ -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: |
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion overlay

0 comments on commit 1aaeca3

Please sign in to comment.