From 965418be8003d4ff5d24698e9d0e9b7ddf81928d Mon Sep 17 00:00:00 2001 From: Shunsuke Shibayama Date: Sun, 10 Sep 2023 13:54:30 +0900 Subject: [PATCH] Update release.yml --- .github/workflows/release.yml | 39 +++++++++++++++++++++++++---------- setup.py | 2 +- 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 130b754..7692821 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,17 +30,20 @@ jobs: strategy: matrix: include: - - target: armv7-unknown-linux-gnueabihf - os: ubuntu-latest - - target: aarch64-unknown-linux-gnu - os: ubuntu-latest - - target: aarch64-apple-darwin - os: macos-latest + # - target: armv7-unknown-linux-gnueabihf + # os: ubuntu-latest + # - target: aarch64-unknown-linux-gnu + # os: ubuntu-latest + # - target: aarch64-apple-darwin + # os: macos-latest - target: x86_64-unknown-linux-gnu + platform: linux os: ubuntu-latest - target: x86_64-apple-darwin + platform: macos os: macos-latest - target: x86_64-pc-windows-msvc + platform: windows os: windows-latest # - target: i686-pc-windows-msvc # os: windows-latest @@ -53,13 +56,27 @@ jobs: - name: setup-tools run: | rustup update stable - pip3 install twine build - # rustup target add ${{ matrix.target }} + pip3 install twine build cibuildwheel setuptools-rust + rustup target add ${{ matrix.target }} + - name: build + run: cibuildwheel --output-dir dist --platform ${{ matrix.platform }} + env: + # CIBW_BUILD: '${{ matrix.python-version }}-*' + # rust doesn't seem to be available for musl linux on i686 + CIBW_SKIP: '*-musllinux_i686' + CIBW_ENVIRONMENT: 'PATH="$HOME/.cargo/bin:$PATH" CARGO_TERM_COLOR="always"' + CIBW_ENVIRONMENT_WINDOWS: 'PATH="$UserProfile\.cargo\bin;$PATH"' + CIBW_BEFORE_BUILD: rustup show + CIBW_BEFORE_BUILD_LINUX: > + curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=stable --profile=minimal -y && + rustup show + # CIBW_TEST_SKIP: '*-macosx_arm64 *-macosx_universal2:arm64' + # CIBW_BUILD_VERBOSITY: 1 - name: upload run: | - cargo build --release - python3 -m build --wheel - twine upload -u mtshiba -p ${{ secrets.PYPI_PASSWORD }} dist/* + twine upload -u mtshiba -p ${{ secrets.PYPI_PASSWORD }} --skip-existing dist/* + # cargo build --release --target ${{ matrix.target }} + # python3 -m build --wheel # maturin publish -u mtshiba -p ${{ secrets.PYPI_PASSWORD }} --target ${{ matrix.target }} --skip-existing upload-assets: needs: create-release diff --git a/setup.py b/setup.py index 1b6eb01..10b9785 100644 --- a/setup.py +++ b/setup.py @@ -54,7 +54,7 @@ def run(self): long_description_content_type="text/markdown", version=version, license=license, - python_requires=">=3", + python_requires=">=3.11", rust_extensions=[ RustBin("pylyzer", args=cargo_args, cargo_manifest_args=["--locked"]) ],