Skip to content

Commit 9c81441

Browse files
authored
Merge pull request #541 from sanders41/maturin-publish
Fix for broken pyo3 publish action on newer ubuntu
2 parents bad15c6 + 31e551c commit 9c81441

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

src/github_actions.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,6 +1041,9 @@ jobs:
10411041
runs-on: ubuntu-latest
10421042
steps:
10431043
- uses: actions/checkout@v4
1044+
- uses: actions/setup-python@v5
1045+
with:
1046+
python-version: "{python_version}"
10441047
- name: Build sdist
10451048
uses: PyO3/maturin-action@v1
10461049
with:
@@ -1058,6 +1061,9 @@ jobs:
10581061
needs: [linux, windows, macos, sdist]
10591062
steps:
10601063
- uses: actions/download-artifact@v4
1064+
- uses: actions/setup-python@v5
1065+
with:
1066+
python-version: "{python_version}"
10611067
- name: Publish to PyPI
10621068
uses: PyO3/maturin-action@v1
10631069
env:

src/snapshots/python_project__github_actions__tests__save_pypi_publish_file_pyo3.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
source: src/github_actions.rs
33
expression: content
44
---
5-
"name: PyPi Publish\non:\n release:\n types:\n - published\npermissions:\n contents: read\njobs:\n linux:\n runs-on: ubuntu-latest\n strategy:\n matrix:\n target: [x86_64, x86, aarch64, armv7, s390x, ppc64le]\n steps:\n - uses: actions/checkout@v4\n - uses: actions/setup-python@v5\n with:\n python-version: \"3.12\"\n - name: Build wheels\n uses: PyO3/maturin-action@v1\n with:\n target: ${{ matrix.target }}\n args: --release --out dist --find-interpreter\n sccache: 'true'\n manylinux: auto\n - name: Upload wheels\n uses: actions/upload-artifact@v4\n with:\n name: wheels-linux-${{ matrix.target }}\n path: dist\n windows:\n runs-on: windows-latest\n strategy:\n matrix:\n target: [x64, x86]\n steps:\n - uses: actions/checkout@v4\n - uses: actions/setup-python@v5\n with:\n python-version: \"3.12\"\n architecture: ${{ matrix.target }}\n - name: Build wheels\n uses: PyO3/maturin-action@v1\n with:\n target: ${{ matrix.target }}\n args: --release --out dist --find-interpreter\n sccache: 'true'\n - name: Upload wheels\n uses: actions/upload-artifact@v4\n with:\n name: wheels-windows-${{ matrix.target }}\n path: dist\n macos:\n runs-on: macos-latest\n strategy:\n matrix:\n target: [x86_64, aarch64]\n steps:\n - uses: actions/checkout@v4\n - uses: actions/setup-python@v5\n with:\n python-version: \"3.12\"\n - name: Build wheels\n uses: PyO3/maturin-action@v1\n with:\n target: ${{ matrix.target }}\n args: --release --out dist --find-interpreter\n sccache: 'true'\n - name: Upload wheels\n uses: actions/upload-artifact@v4\n with:\n name: wheels-macos-${{ matrix.target }}\n path: dist\n sdist:\n runs-on: ubuntu-latest\n steps:\n - uses: actions/checkout@v4\n - name: Build sdist\n uses: PyO3/maturin-action@v1\n with:\n command: sdist\n args: --out dist\n - name: Upload sdist\n uses: actions/upload-artifact@v4\n with:\n name: wheels-sdist\n path: dist\n release:\n name: Release\n runs-on: ubuntu-latest\n if: \"startsWith(github.ref, 'refs/tags/')\"\n needs: [linux, windows, macos, sdist]\n steps:\n - uses: actions/download-artifact@v4\n - name: Publish to PyPI\n uses: PyO3/maturin-action@v1\n env:\n MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}\n with:\n command: upload\n args: --non-interactive --skip-existing wheels-*/*\n"
5+
"name: PyPi Publish\non:\n release:\n types:\n - published\npermissions:\n contents: read\njobs:\n linux:\n runs-on: ubuntu-latest\n strategy:\n matrix:\n target: [x86_64, x86, aarch64, armv7, s390x, ppc64le]\n steps:\n - uses: actions/checkout@v4\n - uses: actions/setup-python@v5\n with:\n python-version: \"3.12\"\n - name: Build wheels\n uses: PyO3/maturin-action@v1\n with:\n target: ${{ matrix.target }}\n args: --release --out dist --find-interpreter\n sccache: 'true'\n manylinux: auto\n - name: Upload wheels\n uses: actions/upload-artifact@v4\n with:\n name: wheels-linux-${{ matrix.target }}\n path: dist\n windows:\n runs-on: windows-latest\n strategy:\n matrix:\n target: [x64, x86]\n steps:\n - uses: actions/checkout@v4\n - uses: actions/setup-python@v5\n with:\n python-version: \"3.12\"\n architecture: ${{ matrix.target }}\n - name: Build wheels\n uses: PyO3/maturin-action@v1\n with:\n target: ${{ matrix.target }}\n args: --release --out dist --find-interpreter\n sccache: 'true'\n - name: Upload wheels\n uses: actions/upload-artifact@v4\n with:\n name: wheels-windows-${{ matrix.target }}\n path: dist\n macos:\n runs-on: macos-latest\n strategy:\n matrix:\n target: [x86_64, aarch64]\n steps:\n - uses: actions/checkout@v4\n - uses: actions/setup-python@v5\n with:\n python-version: \"3.12\"\n - name: Build wheels\n uses: PyO3/maturin-action@v1\n with:\n target: ${{ matrix.target }}\n args: --release --out dist --find-interpreter\n sccache: 'true'\n - name: Upload wheels\n uses: actions/upload-artifact@v4\n with:\n name: wheels-macos-${{ matrix.target }}\n path: dist\n sdist:\n runs-on: ubuntu-latest\n steps:\n - uses: actions/checkout@v4\n - uses: actions/setup-python@v5\n with:\n python-version: \"3.12\"\n - name: Build sdist\n uses: PyO3/maturin-action@v1\n with:\n command: sdist\n args: --out dist\n - name: Upload sdist\n uses: actions/upload-artifact@v4\n with:\n name: wheels-sdist\n path: dist\n release:\n name: Release\n runs-on: ubuntu-latest\n if: \"startsWith(github.ref, 'refs/tags/')\"\n needs: [linux, windows, macos, sdist]\n steps:\n - uses: actions/download-artifact@v4\n - uses: actions/setup-python@v5\n with:\n python-version: \"3.12\"\n - name: Publish to PyPI\n uses: PyO3/maturin-action@v1\n env:\n MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}\n with:\n command: upload\n args: --non-interactive --skip-existing wheels-*/*\n"

src/snapshots/python_project__github_actions__tests__save_pypi_publish_file_pyo3_docs.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
source: src/github_actions.rs
33
expression: content
44
---
5-
"name: PyPi Publish\non:\n release:\n types:\n - published\npermissions:\n contents: read\njobs:\n linux:\n runs-on: ubuntu-latest\n strategy:\n matrix:\n target: [x86_64, x86, aarch64, armv7, s390x, ppc64le]\n steps:\n - uses: actions/checkout@v4\n - uses: actions/setup-python@v5\n with:\n python-version: \"3.12\"\n - name: Build wheels\n uses: PyO3/maturin-action@v1\n with:\n target: ${{ matrix.target }}\n args: --release --out dist --find-interpreter\n sccache: 'true'\n manylinux: auto\n - name: Upload wheels\n uses: actions/upload-artifact@v4\n with:\n name: wheels-linux-${{ matrix.target }}\n path: dist\n windows:\n runs-on: windows-latest\n strategy:\n matrix:\n target: [x64, x86]\n steps:\n - uses: actions/checkout@v4\n - uses: actions/setup-python@v5\n with:\n python-version: \"3.12\"\n architecture: ${{ matrix.target }}\n - name: Build wheels\n uses: PyO3/maturin-action@v1\n with:\n target: ${{ matrix.target }}\n args: --release --out dist --find-interpreter\n sccache: 'true'\n - name: Upload wheels\n uses: actions/upload-artifact@v4\n with:\n name: wheels-windows-${{ matrix.target }}\n path: dist\n macos:\n runs-on: macos-latest\n strategy:\n matrix:\n target: [x86_64, aarch64]\n steps:\n - uses: actions/checkout@v4\n - uses: actions/setup-python@v5\n with:\n python-version: \"3.12\"\n - name: Build wheels\n uses: PyO3/maturin-action@v1\n with:\n target: ${{ matrix.target }}\n args: --release --out dist --find-interpreter\n sccache: 'true'\n - name: Upload wheels\n uses: actions/upload-artifact@v4\n with:\n name: wheels-macos-${{ matrix.target }}\n path: dist\n sdist:\n runs-on: ubuntu-latest\n steps:\n - uses: actions/checkout@v4\n - name: Build sdist\n uses: PyO3/maturin-action@v1\n with:\n command: sdist\n args: --out dist\n - name: Upload sdist\n uses: actions/upload-artifact@v4\n with:\n name: wheels-sdist\n path: dist\n release:\n name: Release\n runs-on: ubuntu-latest\n if: \"startsWith(github.ref, 'refs/tags/')\"\n needs: [linux, windows, macos, sdist]\n steps:\n - uses: actions/download-artifact@v4\n - name: Publish to PyPI\n uses: PyO3/maturin-action@v1\n env:\n MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}\n with:\n command: upload\n args: --non-interactive --skip-existing wheels-*/*\n - name: Deploy Docs\n run: mkdocs gh-deploy --force\n"
5+
"name: PyPi Publish\non:\n release:\n types:\n - published\npermissions:\n contents: read\njobs:\n linux:\n runs-on: ubuntu-latest\n strategy:\n matrix:\n target: [x86_64, x86, aarch64, armv7, s390x, ppc64le]\n steps:\n - uses: actions/checkout@v4\n - uses: actions/setup-python@v5\n with:\n python-version: \"3.12\"\n - name: Build wheels\n uses: PyO3/maturin-action@v1\n with:\n target: ${{ matrix.target }}\n args: --release --out dist --find-interpreter\n sccache: 'true'\n manylinux: auto\n - name: Upload wheels\n uses: actions/upload-artifact@v4\n with:\n name: wheels-linux-${{ matrix.target }}\n path: dist\n windows:\n runs-on: windows-latest\n strategy:\n matrix:\n target: [x64, x86]\n steps:\n - uses: actions/checkout@v4\n - uses: actions/setup-python@v5\n with:\n python-version: \"3.12\"\n architecture: ${{ matrix.target }}\n - name: Build wheels\n uses: PyO3/maturin-action@v1\n with:\n target: ${{ matrix.target }}\n args: --release --out dist --find-interpreter\n sccache: 'true'\n - name: Upload wheels\n uses: actions/upload-artifact@v4\n with:\n name: wheels-windows-${{ matrix.target }}\n path: dist\n macos:\n runs-on: macos-latest\n strategy:\n matrix:\n target: [x86_64, aarch64]\n steps:\n - uses: actions/checkout@v4\n - uses: actions/setup-python@v5\n with:\n python-version: \"3.12\"\n - name: Build wheels\n uses: PyO3/maturin-action@v1\n with:\n target: ${{ matrix.target }}\n args: --release --out dist --find-interpreter\n sccache: 'true'\n - name: Upload wheels\n uses: actions/upload-artifact@v4\n with:\n name: wheels-macos-${{ matrix.target }}\n path: dist\n sdist:\n runs-on: ubuntu-latest\n steps:\n - uses: actions/checkout@v4\n - uses: actions/setup-python@v5\n with:\n python-version: \"3.12\"\n - name: Build sdist\n uses: PyO3/maturin-action@v1\n with:\n command: sdist\n args: --out dist\n - name: Upload sdist\n uses: actions/upload-artifact@v4\n with:\n name: wheels-sdist\n path: dist\n release:\n name: Release\n runs-on: ubuntu-latest\n if: \"startsWith(github.ref, 'refs/tags/')\"\n needs: [linux, windows, macos, sdist]\n steps:\n - uses: actions/download-artifact@v4\n - uses: actions/setup-python@v5\n with:\n python-version: \"3.12\"\n - name: Publish to PyPI\n uses: PyO3/maturin-action@v1\n env:\n MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}\n with:\n command: upload\n args: --non-interactive --skip-existing wheels-*/*\n - name: Deploy Docs\n run: mkdocs gh-deploy --force\n"

0 commit comments

Comments
 (0)