diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dcdcc42..62b21b5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,8 @@ jobs: strategy: fail-fast: true matrix: - os: [ubuntu, macos, windows] + # os: [ubuntu, macos, windows] + os: [ubuntu] python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] runs-on: ${{ matrix.os }}-latest @@ -309,7 +310,7 @@ jobs: if-no-files-found: error build-bdists-windows: - name: build bdist for ${{ matrix.python-version }}/${{ matrix.py-impl }} on windows + name: build bdist for ${{ matrix.python-version }}/${{ matrix.py-impl }}/${{ matrix.arch }} on windows # run on releases, and on PRs with the label 'Full Build' if: success() && (startsWith(github.ref, 'refs/tags/') || contains(github.event.pull_request.labels.*.name, 'Full Build')) strategy: @@ -317,19 +318,19 @@ jobs: matrix: python-version: ['37', '38', '39', '310', '311'] py-impl: ['cp', 'pp'] - arch: ['amd64', 'arm64'] + arch: ['AMD64', 'ARM64'] exclude: # PyPy only goes up to 3.10: https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip. - py-impl: pp python-version: 311 - # Windows does not support arm64 until 3.8: https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip. + # Windows does not support ARM64 until 3.8: https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip. - python-version: 37 - arch: arm64 + arch: ARM64 - python-version: 38 - arch: arm64 - # Windows PyPy does not support arm64: https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip. + arch: ARM64 + # Windows PyPy does not support ARM64: https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip. - py-impl: pp - arch: arm64 + arch: ARM64 runs-on: windows-latest steps: @@ -340,13 +341,12 @@ jobs: with: python-version: 3.11 - - run: pip install --upgrade pip - - name: build wheels uses: pypa/cibuildwheel@v2.14.1 env: - CIBW_ARCHS_LINUX: ${{ matrix.arch }} + CIBW_ARCHS_WINDOWS: ${{ matrix.arch }} CIBW_BUILD: ${{ matrix.py-impl }}${{ matrix.python-version }}-win_${{ matrix.arch }} + CIBW_BEFORE_ALL: "rmdir C:\\Users\\runneradmin\\.cargo /s /q && curl.exe --url https://static.rust-lang.org/rustup/dist/i686-pc-windows-gnu/rustup-init.exe --output rustup-init.exe && .\\rustup-init.exe --default-toolchain nightly --default-host aarch64-pc-windows-msvc -y && rustup.exe target add aarch64-pc-windows-msvc" - uses: actions/upload-artifact@v3 with: diff --git a/Cargo.toml b/Cargo.toml index 2995828..aa6347a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ default-features = false features = ["deflate", "time", "rayon", "merge"] [workspace.package] -version = "0.0.5" +version = "0.0.6" authors = ["Danny McClanahan "] edition = "2021" license = "Apache-2.0" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 2aff73c..04f92e9 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -15,7 +15,7 @@ description = "A command-line interface to high-performance parallel clap = { version = "4", features = ["derive"] } displaydoc.workspace = true eyre = "0.6.8" -libmedusa-zip = { path = "../lib", version = "0.0.5" } +libmedusa-zip = { path = "../lib", version = "0.0.6" } regex = "1" serde = { version = "1", features = ["derive"] } serde_json = "1.0" diff --git a/py/Cargo.toml b/py/Cargo.toml index 1a566ed..3e6d0d0 100644 --- a/py/Cargo.toml +++ b/py/Cargo.toml @@ -16,7 +16,7 @@ name = "pymedusa_zip" crate-type = ["cdylib"] [dependencies] -libmedusa-zip = { path = "../lib", version = "0.0.5" } +libmedusa-zip = { path = "../lib", version = "0.0.6" } once_cell = { version = "1", optional = true } pyo3 = { version = "0.19", features = ["extension-module"] } pyo3-asyncio = { version = "0.19", features = ["tokio-runtime"], optional = true } diff --git a/pyproject.toml b/pyproject.toml index 6f69169..390b224 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "medusa-zip" -version = "0.0.5" +version = "0.0.6" description = "High-performance parallelized implementations of common zip file operations." license = {text = "Apache-2.0"} readme = "py/README.md"