From e2b1484789ed945712f7dfd2fe76120587c84f84 Mon Sep 17 00:00:00 2001 From: Tpt Date: Sat, 4 Dec 2021 17:06:40 +0100 Subject: [PATCH] CI: Uses messense/maturin-action --- .github/workflows/build.yml | 26 ++++++++++---------------- .github/workflows/release.yml | 24 +++++++++++------------- 2 files changed, 21 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9bf61e78..9a1050f1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -81,12 +81,11 @@ jobs: - uses: actions/checkout@v2 with: submodules: true - - uses: actions/setup-python@v2 + - uses: messense/maturin-action@v1 with: - python-version: 3.6 - - run: pip install 'maturin~=0.12' - - run: maturin build - working-directory: ./python + manylinux: auto + command: build + args: -m python/Cargo.toml python_wheel_mac: runs-on: macos-latest @@ -95,13 +94,10 @@ jobs: - uses: actions/checkout@v2 with: submodules: true - - run: rustup update && rustup target add aarch64-apple-darwin - - uses: actions/setup-python@v2 + - uses: messense/maturin-action@v1 with: - python-version: 3.6 - - run: pip install 'maturin~=0.12' - - run: maturin build --universal2 - working-directory: ./python + command: build + args: -m python/Cargo.toml --universal2 python_wheel_windows: runs-on: windows-latest @@ -110,9 +106,7 @@ jobs: - uses: actions/checkout@v2 with: submodules: true - - uses: actions/setup-python@v2 + - uses: messense/maturin-action@v1 with: - python-version: 3.6 - - run: pip install 'maturin~=0.12' - - run: maturin build - working-directory: ./python + command: build + args: -m python/Cargo.toml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6efab1f0..057c11ce 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -97,8 +97,11 @@ jobs: with: submodules: true - run: sed -i 's/path="..\/lib", //g' python/Cargo.toml - - run: docker run --rm -v $(pwd):/io konstin2/maturin:v0.11.1 publish -u __token__ -p ${{ secrets.PYPI_PASSWORD }} - working-directory: ./python + - uses: messense/maturin-action@v1 + with: + manylinux: auto + command: publish + args: -m python/Cargo.toml -u __token__ -p ${{ secrets.PYPI_PASSWORD }} publish_pypi_mac: runs-on: macos-latest needs: publish_lib_crate @@ -106,13 +109,10 @@ jobs: - uses: actions/checkout@v2 with: submodules: true - - run: rustup update && rustup target add aarch64-apple-darwin - - uses: actions/setup-python@v2 + - uses: messense/maturin-action@v1 with: - python-version: 3.6 - - run: pip install 'maturin~=0.12' - - run: maturin publish --universal2 --no-sdist -u __token__ -p ${{ secrets.PYPI_PASSWORD }} - working-directory: ./python + command: publish + args: -m python/Cargo.toml --universal2 --no-sdist -u __token__ -p ${{ secrets.PYPI_PASSWORD }} publish_pypi_windows: runs-on: windows-latest needs: publish_lib_crate @@ -120,12 +120,10 @@ jobs: - uses: actions/checkout@v2 with: submodules: true - - uses: actions/setup-python@v2 + - uses: messense/maturin-action@v1 with: - python-version: 3.6 - - run: pip install 'maturin~=0.12' - - run: maturin publish --no-sdist -u __token__ -p ${{ secrets.PYPI_PASSWORD }} - working-directory: ./python + command: publish + args: -m python/Cargo.toml --no-sdist -u __token__ -p ${{ secrets.PYPI_PASSWORD }} publish_npm: runs-on: ubuntu-latest steps: