Skip to content

Commit 25264c3

Browse files
committed
Remove unsupported interpreter input in build.yml
Update manylinux x86_64 and aarch64 sections to pass interpreter via args using -i ${{ matrix.interpreter }}. Verify no remaining usage of interpreter in build.yml.
1 parent 0ebd476 commit 25264c3

1 file changed

Lines changed: 15 additions & 17 deletions

File tree

.github/workflows/build.yml

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
- uses: astral-sh/setup-uv@v7
3737
with:
38-
enable-cache: true
38+
enable-cache: true
3939

4040
# Use the --no-install-package to only install the dependencies
4141
# but do not yet build the rust library
@@ -50,15 +50,15 @@ jobs:
5050
5151
- name: Run codespell
5252
run: |
53-
uv run --no-project codespell --toml pyproject.toml
53+
uv run --no-project codespell --toml pyproject.toml
5454
5555
generate-license:
5656
runs-on: ubuntu-latest
5757
steps:
5858
- uses: actions/checkout@v5
5959
- uses: astral-sh/setup-uv@v7
6060
with:
61-
enable-cache: true
61+
enable-cache: true
6262

6363
- name: Generate license file
6464
run: uv run --no-project python ./dev/create_license.py
@@ -141,7 +141,7 @@ jobs:
141141

142142
- uses: astral-sh/setup-uv@v7
143143
with:
144-
enable-cache: true
144+
enable-cache: true
145145

146146
- name: Validate interpreter/wheel mode
147147
shell: bash
@@ -246,7 +246,7 @@ jobs:
246246

247247
- uses: astral-sh/setup-uv@v7
248248
with:
249-
enable-cache: true
249+
enable-cache: true
250250

251251
- name: Validate interpreter/wheel mode
252252
shell: bash
@@ -345,8 +345,7 @@ jobs:
345345
target: x86_64
346346
manylinux: auto
347347
rustup-components: rust-std rustfmt # Keep them in one line due to https://github.com/PyO3/maturin-action/issues/153
348-
interpreter: ${{ matrix.interpreter }}
349-
args: --release --manylinux 2014 --features ${{ matrix.maturin-features }}
348+
args: --release --manylinux 2014 --features ${{ matrix.maturin-features }} -i ${{ matrix.interpreter }}
350349
- name: Archive wheels
351350
uses: actions/upload-artifact@v4
352351
with:
@@ -402,8 +401,7 @@ jobs:
402401
# Use manylinux_2_28-cross because the manylinux2014-cross has GCC 4.8.5, which causes the build to fail
403402
manylinux: 2_28
404403
rustup-components: rust-std rustfmt # Keep them in one line due to https://github.com/PyO3/maturin-action/issues/153
405-
interpreter: ${{ matrix.interpreter }}
406-
args: --release --features ${{ matrix.maturin-features }}
404+
args: --release --features ${{ matrix.maturin-features }} -i ${{ matrix.interpreter }}
407405
- name: Archive wheels
408406
uses: actions/upload-artifact@v4
409407
with:
@@ -432,14 +430,14 @@ jobs:
432430
args: --release --sdist --out dist --features protoc,substrait
433431
- name: Assert sdist build does not generate wheels
434432
run: |
435-
if [ "$(ls -A target/wheels)" ]; then
436-
echo "Error: Sdist build generated wheels"
437-
exit 1
438-
else
439-
echo "Directory is clean"
440-
fi
433+
if [ "$(ls -A target/wheels)" ]; then
434+
echo "Error: Sdist build generated wheels"
435+
exit 1
436+
else
437+
echo "Directory is clean"
438+
fi
441439
shell: bash
442-
440+
443441
merge-build-artifacts:
444442
runs-on: ubuntu-latest
445443
needs:
@@ -459,7 +457,7 @@ jobs:
459457
build-docs:
460458
name: Build docs
461459
runs-on: ubuntu-latest
462-
needs: [build-manylinux-x86_64] # Only need the Linux wheel for docs
460+
needs: [build-manylinux-x86_64] # Only need the Linux wheel for docs
463461
# Only run docs on main branch pushes, tags, or PRs
464462
if: github.event_name == 'push' || github.event_name == 'pull_request'
465463
steps:

0 commit comments

Comments
 (0)