Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: PyO3/maturin-action
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.47.2
Choose a base ref
...
head repository: PyO3/maturin-action
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.47.3
Choose a head ref
  • 3 commits
  • 5 files changed
  • 3 contributors

Commits on Mar 13, 2025

  1. Update versions-manifest.json (#333) 

    Co-authored-by: messense <1556054+messense@users.noreply.github.com>
    @github-actions @messense
    github-actions[bot] and messense authored Mar 13, 2025
    Loading
    Loading status checks…

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ac4fe6e View commit details

Commits on Mar 19, 2025

  1. Install ziglang<0.14.0 

    Closes #335
    @messense
    messense committed Mar 19, 2025
    Loading
    Loading status checks…

    Verified

    This commit was signed with the committer’s verified signature.
    messense messense
    GPG key ID: BB41A8A2C716CCA9
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3b57d56 View commit details

  2. Bump version to 1.47.3

    @messense
    messense committed Mar 19, 2025
    Loading
    Loading status checks…

    Verified

    This commit was signed with the committer’s verified signature.
    messense messense
    GPG key ID: BB41A8A2C716CCA9
    Verified
    Learn about vigilant mode
    Copy the full SHA
    22fe573 View commit details
Showing with 61 additions and 28 deletions.
  1. +2 −2 dist/index.js
  2. +19 −17 package-lock.json
  3. +1 −1 package.json
  4. +2 −2 src/index.ts
  5. +37 −6 versions-manifest.json
4 changes: 2 additions & 2 deletions dist/index.js
View file
Original file line number Diff line number Diff line change
@@ -11899,7 +11899,7 @@ async function dockerBuild(container, maturinRelease, hostHomeMount, args) {
}
commands.push('echo "::group::Install Rust"', `command -v rustup &> /dev/null && { rm -frv ~/.rustup/toolchains/; rustup show; } || curl --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain ${rustToolchain}`, 'export PATH="$HOME/.cargo/bin:$HOME/.local/bin:$PATH"', `echo "Install Rust toolchain ${rustToolchain}"`, `rustup override set ${rustToolchain}`, `rustup component add llvm-tools-preview || true`, 'echo "::endgroup::"', 'export PATH="$PATH:/opt/python/cp37-cp37m/bin:/opt/python/cp38-cp38/bin:/opt/python/cp39-cp39/bin:/opt/python/cp310-cp310/bin:/opt/python/cp311-cp311/bin:/opt/python/cp312-cp312/bin"', 'echo "::group::Install maturin"', `curl -L ${url} | tar -xz -C /usr/local/bin`, 'maturin --version || true', 'which patchelf > /dev/null || python3 -m pip install --user patchelf', 'python3 -m pip install --user cffi || true', 'echo "::endgroup::"');
if (args.includes('--zig')) {
commands.push('echo "::group::Install Zig"', 'python3 -m pip install --user ziglang', 'echo "::endgroup::"');
commands.push('echo "::group::Install Zig"', 'python3 -m pip install --user "ziglang<0.14.0"', 'echo "::endgroup::"');
}
if (target.length > 0) {
commands.push('echo "::group::Install Rust target"', `if [[ ! -d $(rustc --print target-libdir --target ${target}) ]]; then rustup target add ${target}; fi`, 'echo "::endgroup::"');
@@ -12136,7 +12136,7 @@ async function hostBuild(maturinRelease, args) {
core.endGroup();
if (args.includes('--zig')) {
core.startGroup('Install Zig');
await exec.exec('python3', ['-m', 'pip', 'install', 'ziglang']);
await exec.exec('python3', ['-m', 'pip', 'install', 'ziglang<0.14.0']);
core.endGroup();
}
if (sccache) {
36 changes: 19 additions & 17 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "maturin-action",
"version": "1.47.2",
"version": "1.47.3",
"description": "GitHub Action to install and run a custom maturin command",
"main": "dist/index.js",
"scripts": {
4 changes: 2 additions & 2 deletions src/index.ts
View file
Original file line number Diff line number Diff line change
@@ -668,7 +668,7 @@ async function dockerBuild(
if (args.includes('--zig')) {
commands.push(
'echo "::group::Install Zig"',
'python3 -m pip install --user ziglang',
'python3 -m pip install --user "ziglang<0.14.0"',
'echo "::endgroup::"'
)
}
@@ -982,7 +982,7 @@ async function hostBuild(
core.endGroup()
if (args.includes('--zig')) {
core.startGroup('Install Zig')
await exec.exec('python3', ['-m', 'pip', 'install', 'ziglang'])
await exec.exec('python3', ['-m', 'pip', 'install', 'ziglang<0.14.0'])
core.endGroup()
}
if (sccache) {
43 changes: 37 additions & 6 deletions versions-manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,35 @@
[
{
"files": [
{
"arch": "x64",
"download_url": "https://github.com/PyO3/maturin/releases/download/v1.8.3/maturin-x86_64-apple-darwin.tar.gz",
"filename": "maturin-x86_64-apple-darwin.tar.gz",
"platform": "darwin"
},
{
"arch": "x64",
"download_url": "https://github.com/PyO3/maturin/releases/download/v1.8.3/maturin-x86_64-unknown-linux-musl.tar.gz",
"filename": "maturin-x86_64-unknown-linux-musl.tar.gz",
"platform": "linux"
},
{
"arch": "x86",
"download_url": "https://github.com/PyO3/maturin/releases/download/v1.8.3/maturin-i686-pc-windows-msvc.zip",
"filename": "maturin-i686-pc-windows-msvc.zip",
"platform": "win32"
},
{
"arch": "x64",
"download_url": "https://github.com/PyO3/maturin/releases/download/v1.8.3/maturin-x86_64-pc-windows-msvc.zip",
"filename": "maturin-x86_64-pc-windows-msvc.zip",
"platform": "win32"
}
],
"release_url": "https://github.com/PyO3/maturin/releases/tag/v1.8.3",
"stable": true,
"version": "1.8.3"
},
{
"files": [
{
@@ -4632,17 +4663,17 @@
"filename": "maturin-x86_64-unknown-linux-musl.tar.gz",
"platform": "linux"
},
{
"arch": "x86",
"download_url": "https://github.com/PyO3/maturin/releases/download/v0.12.4/maturin-i686-pc-windows-msvc.zip",
"filename": "maturin-i686-pc-windows-msvc.zip",
"platform": "win32"
},
{
"arch": "x64",
"download_url": "https://github.com/PyO3/maturin/releases/download/v0.12.4/maturin-x86_64-pc-windows-msvc.zip",
"filename": "maturin-x86_64-pc-windows-msvc.zip",
"platform": "win32"
},
{
"arch": "x86",
"download_url": "https://github.com/PyO3/maturin/releases/download/v0.12.4/maturin-i686-pc-windows-msvc.zip",
"filename": "maturin-i686-pc-windows-msvc.zip",
"platform": "win32"
}
],
"release_url": "https://github.com/PyO3/maturin/releases/tag/v0.12.4",