diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml deleted file mode 100644 index 55747fd0..00000000 --- a/.github/workflows/build-wheels.yml +++ /dev/null @@ -1,58 +0,0 @@ -name: Build - -# Only trigger, when the build workflow succeeded -on: - workflow_run: - workflows: ["Publish to PyPI"] - types: - - completed - -jobs: - build_wheels: - name: Build wheels on ${{ matrix.os }} - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-20.04, windows-2019, macos-10.15] - - steps: - - uses: actions/checkout@v2 - - # Make sure tags are fetched so we can get a version. - - run: | - git fetch --prune --unshallow --tags - - - name: Build wheels - uses: pypa/cibuildwheel@v2.2.2 - env: - CIBW_ARCHS_MACOS: x86_64 arm64 - - - uses: actions/upload-artifact@v2 - with: - name: wheels - path: ./wheelhouse/*.whl - - # Upload wheels to PyPi - upload_wheels: - needs: build_wheels - runs-on: ubuntu-latest - steps: - - name: Download built wheels - uses: actions/download-artifact@v2 - with: - name: wheels - path: wheelhouse - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install -U twine - - - name: Build and publish - env: - # Remove AA for production... - TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} - TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} - - run: | - twine upload wheelhouse/* diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 77772429..050d489f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/checkout@v2 - # Make sure tags are fetched so we can get a version. + # Make sure tags are fetched, so we can get a version. - run: | git fetch --prune --unshallow --tags @@ -35,5 +35,5 @@ jobs: TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | - python setup.py sdist + python setup.py sdist bdist_wheel twine upload dist/*