Skip to content

Commit fd9db22

Browse files
committed
Merge branch 'lvaccaro-swift-updates'
2 parents 3f51bee + 43bbb6b commit fd9db22

3 files changed

Lines changed: 7 additions & 6 deletions

File tree

.github/workflows/bindings.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
target: aarch64-unknown-linux-gnu
1919
- os: ubuntu-22.04
2020
target: x86_64-unknown-linux-gnu
21-
- os: macos-14
21+
- os: macos-15
2222
target: aarch64-apple-darwin
23-
- os: macos-14
23+
- os: macos-15
2424
target: x86_64-apple-darwin
2525
- os: windows-2022
2626
target: x86_64-pc-windows-msvc
@@ -65,7 +65,7 @@ jobs:
6565
path: |
6666
target/${{ matrix.target }}/release/liblwk.dylib
6767
target/${{ matrix.target }}/release/liblwk.a
68-
if: matrix.os == 'macos-14'
68+
if: matrix.os == 'macos-15'
6969

7070
build-cpp:
7171
needs: build

.github/workflows/cont_integration.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
build-test:
1414
strategy:
1515
matrix:
16-
os: ["macos-14", "ubuntu-22.04", "windows-2022"]
16+
os: ["macos-15", "ubuntu-22.04", "windows-2022"]
1717
runs-on: ${{ matrix.os }}
1818
steps:
1919
- name: Checkout
@@ -37,7 +37,7 @@ jobs:
3737
- run: nix build .
3838

3939
just-swift: # swift framework is built in the lwk-swift repo, here we care `just swift` doesn't brake
40-
runs-on: macos-14
40+
runs-on: macos-15
4141
steps:
4242
- uses: actions/checkout@v4
4343
- uses: dtolnay/rust-toolchain@1.85.0
@@ -46,6 +46,7 @@ jobs:
4646
- uses: extractions/setup-just@v2
4747
with:
4848
just-version: 1.5.0 # optional semver specification, otherwise latest
49+
- run: brew install xcodegen
4950
- run: just swift
5051

5152
csharp:

.github/workflows/wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
osx-wheels:
2828
strategy:
2929
matrix:
30-
os: ["macos-14"]
30+
os: ["macos-15"]
3131
runs-on: ${{ matrix.os }}
3232
steps:
3333
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)