From e8ebc4fab68941b5fb9adadd3a39ec2c8ac120ce Mon Sep 17 00:00:00 2001 From: Michael J Ward Date: Mon, 2 Sep 2024 09:52:21 -0500 Subject: [PATCH] build(ci): use proper mac runners (#841) * 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 * update name for macos x86_64 build job * update manylinux x86_64 job name for consistency --- .github/workflows/build.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a4f8b2da..5fae13f2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -117,10 +117,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 + name: Mac x86_64 + runs-on: macos-13 strategy: fail-fast: false matrix: @@ -136,9 +136,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 @@ -159,7 +156,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/ @@ -171,7 +168,7 @@ jobs: build-manylinux-x86_64: needs: [generate-license] - name: Manylinux + name: Manylinux x86_64 runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -262,7 +259,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