From 4893fe6bcddd530e983c11a4ef74d03fe23b265a Mon Sep 17 00:00:00 2001 From: Michael-J-Ward Date: Mon, 26 Aug 2024 16:20:25 -0500 Subject: [PATCH 1/3] build(ci): use proper mac runners GH updated the runner images. macos-14 is now ARM64. macos-13 is last x86_64. Closes https://github.com/apache/datafusion-python/issues/831 --- .github/workflows/build.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0b974f2d..8f580344 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -115,10 +115,10 @@ jobs: name: dist-${{ matrix.os }} path: target/wheels/* - build-macos-aarch64: + build-macos-x86_64: needs: [generate-license] name: Mac arm64 - runs-on: macos-latest + runs-on: macos-13 strategy: fail-fast: false matrix: @@ -134,9 +134,6 @@ jobs: with: toolchain: stable - - name: Set up Rust targets - run: rustup target add aarch64-apple-darwin - - name: Upgrade pip run: python -m pip install --upgrade pip @@ -157,7 +154,7 @@ jobs: repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Build Python package - run: maturin build --release --strip --target aarch64-apple-darwin --features substrait + run: maturin build --release --strip --features substrait - name: List Mac wheels run: find target/wheels/ @@ -260,7 +257,7 @@ jobs: runs-on: ubuntu-latest needs: - build-python-mac-win - - build-macos-aarch64 + - build-macos-x86_64 - build-manylinux-x86_64 - build-manylinux-aarch64 - build-sdist From 700a28af78904e32bfbf26a22fff7ec42db7083c Mon Sep 17 00:00:00 2001 From: Michael-J-Ward Date: Mon, 26 Aug 2024 17:00:50 -0500 Subject: [PATCH 2/3] update name for macos x86_64 build job --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f580344..8f0d1b33 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -117,7 +117,7 @@ jobs: build-macos-x86_64: needs: [generate-license] - name: Mac arm64 + name: Mac x86_64 runs-on: macos-13 strategy: fail-fast: false From cb6efbed905f08560f0bd06c997df5ab527b6b65 Mon Sep 17 00:00:00 2001 From: Michael-J-Ward Date: Mon, 26 Aug 2024 17:05:04 -0500 Subject: [PATCH 3/3] update manylinux x86_64 job name for consistency --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f0d1b33..908211c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -166,7 +166,7 @@ jobs: build-manylinux-x86_64: needs: [generate-license] - name: Manylinux + name: Manylinux x86_64 runs-on: ubuntu-latest steps: - uses: actions/checkout@v4