Skip to content

Commit

Permalink
Upgrade Xcode on macOS
Browse files Browse the repository at this point in the history
  • Loading branch information
thejohnfreeman committed Jun 18, 2024
1 parent dc529c8 commit 72cf248
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/cupcake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,11 @@ jobs:
uses: jwlawson/actions-setup-cmake@v2
with:
cmake-version: ${{ matrix.cmake }}
- name: install XCode on macOS
if: startsWith(matrix.platform, 'macos')
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '15.3'
- name: install Ninja on Linux
if: matrix.generator == 'Ninja' && startsWith(matrix.platform, 'ubuntu')
run: sudo apt install ninja-build
Expand All @@ -118,7 +123,7 @@ jobs:
${{ matrix.profile.cxx }} --version
- name: checkout
uses: actions/checkout@v4
- name: install Conan
- name: install Conan and Cupcake
run: pipx install 'conan~=${{ matrix.conan }}.0' cupcake
- name: check environment
run: |
Expand All @@ -143,7 +148,7 @@ jobs:
if: runner.os == 'macOS'
run: |
conan profile update 'conf.tools.build:exelinkflags=["-Wl,-ld_classic"]' default
- name: configure Conan on Linux
- name: configure Conan for libstdc++
if: runner.os == 'Linux' || matrix.compiler == 'gcc'
run: |
conan profile update settings.compiler.libcxx=libstdc++11 default
Expand Down

0 comments on commit 72cf248

Please sign in to comment.