Skip to content

Commit 52f34d4

Browse files
committed
Use macos-14 with cross-compilation for osx_amd64 builds
macos-13 runners have limited availability. Switch to macos-14 (ARM) and cross-compile for x86_64 using OSX_BUILD_ARCH, matching the approach used by duckdb/extension-ci-tools.
1 parent cca8d58 commit 52f34d4

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

.github/workflows/MainDistributionPipeline.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,16 @@ jobs:
2222
- os: ubuntu-latest
2323
duckdb_arch: linux_amd64
2424
rust_target: x86_64-unknown-linux-gnu
25-
- os: macos-13
25+
- os: macos-14
2626
duckdb_arch: osx_amd64
2727
rust_target: x86_64-apple-darwin
28+
osx_build_arch: x86_64
2829
- os: macos-14
2930
duckdb_arch: osx_arm64
3031
rust_target: aarch64-apple-darwin
32+
osx_build_arch: arm64
33+
env:
34+
OSX_BUILD_ARCH: ${{ matrix.osx_build_arch }}
3135

3236
steps:
3337
- uses: actions/checkout@v4
@@ -37,16 +41,14 @@ jobs:
3741

3842
- name: Install Rust
3943
uses: dtolnay/rust-toolchain@stable
40-
41-
- name: Build Rust library
42-
run: |
43-
cd duckdb_acp_core
44-
cargo build --release
44+
with:
45+
targets: ${{ matrix.rust_target }}
4546

4647
- name: Build extension
4748
run: make release
4849

4950
- name: Test extension
51+
if: matrix.osx_build_arch != 'x86_64'
5052
run: make test
5153

5254
- name: Upload artifact

.github/workflows/Release.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,16 @@ jobs:
5252
- os: ubuntu-latest
5353
duckdb_arch: linux_amd64
5454
rust_target: x86_64-unknown-linux-gnu
55-
- os: macos-13
55+
- os: macos-14
5656
duckdb_arch: osx_amd64
5757
rust_target: x86_64-apple-darwin
58+
osx_build_arch: x86_64
5859
- os: macos-14
5960
duckdb_arch: osx_arm64
6061
rust_target: aarch64-apple-darwin
62+
osx_build_arch: arm64
63+
env:
64+
OSX_BUILD_ARCH: ${{ matrix.osx_build_arch }}
6165

6266
steps:
6367
- uses: actions/checkout@v4
@@ -67,16 +71,14 @@ jobs:
6771

6872
- name: Install Rust
6973
uses: dtolnay/rust-toolchain@stable
70-
71-
- name: Build Rust library
72-
run: |
73-
cd duckdb_acp_core
74-
cargo build --release
74+
with:
75+
targets: ${{ matrix.rust_target }}
7576

7677
- name: Build extension
7778
run: make release
7879

7980
- name: Test extension
81+
if: matrix.osx_build_arch != 'x86_64'
8082
run: make test
8183

8284
- name: Upload artifact

0 commit comments

Comments
 (0)