diff --git a/.github/workflows/publish-to-test-pypi.yml b/.github/workflows/publish-to-test-pypi.yml index 4df5df8..9fdadee 100644 --- a/.github/workflows/publish-to-test-pypi.yml +++ b/.github/workflows/publish-to-test-pypi.yml @@ -12,7 +12,7 @@ on: jobs: build: - if: github.event_name == 'pull_request' && github.ref == 'refs/heads/main' + if: "github.event_name == 'pull_request'" name: Build and Test on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: @@ -39,8 +39,7 @@ jobs: pytest bump_version_and_tag: - if: "!startsWith(github.event.head_commit.message, 'bump:')" - #if: "github.event_name == 'push' && github.ref == 'refs/heads/main' && !startsWith(github.event.head_commit.message, 'bump:')" + if: "github.event_name == 'push' && github.ref == 'refs/heads/main' && !startsWith(github.event.head_commit.message, 'bump:')" name: Bump version and tag on main runs-on: ubuntu-latest steps: @@ -56,11 +55,12 @@ jobs: - name: Print Version run: echo "Bumped to version ${{ steps.cz.outputs.version }}" - name: Push using ssh - #if: github.event_name == 'push' + if: github.event_name == 'push' run: | git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" git config --global user.email "ruelj2@users.noreply.github.com" git push --tags + git push build_wheels: if: "startsWith(github.event.head_commit.message, 'bump:')" @@ -68,8 +68,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-14] - #os: [ubuntu-latest, windows-latest, macos-13, macos-14] + os: [ubuntu-latest, windows-latest, macos-13, macos-14] steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 diff --git a/pyproject.toml b/pyproject.toml index 7c43e21..568977b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,7 @@ tag_format = "v$version" [tool.cibuildwheel] test-command = "pytest {project}/tests" test-extras = ["test"] -test-skip = ["*universal2:arm64", "pp*", "cp{38,39,310,311,312}-manylinux_i686", "cp38-macosx_*:arm64", "*musllinux*", "*ppc64le", "*s390x"] +test-skip = ["*universal2:arm64", "pp*", "cp{38,39,310,311,312}-manylinux_i686", "cp38-macosx_arm64", "*musllinux*", "*ppc64le", "*s390x"] # Setuptools bug causes collision between pypy and cpython artifacts before-build = "rm -rf {project}/build"