diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1344b71..71698f9 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -12,7 +12,7 @@ jobs: # CentOS 7 64 bits Docker Hub image that 'build-linux-wheels' executes in. # See https://github.com/pypa/manylinux for this particular container: # * CPython 3.5, 3.6, 3.7, 3.8, 3.9 and 3.10, installed in /opt/python/- - container: quay.io/pypa/manylinux2014_x86_64 + container: quay.io/pypa/manylinux_2_28_x86_64 steps: - name: "Checkout the full project" uses: actions/checkout@v1 @@ -22,15 +22,13 @@ jobs: - name: "Build and publish wheels" shell: bash env: - MATURIN_USERNAME: ${{ secrets.PYPI_USERNAME_FXP }} - MATURIN_PASSWORD: ${{ secrets.PYPI_PASSWORD_FXP }} + MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN_FXP }} run: | source $HOME/.cargo/env cd crates/cli for PYBIN in /opt/python/cp38*/bin; do "${PYBIN}/pip" install maturin - "${PYBIN}/maturin" publish -b bin -i "${PYBIN}/python" --skip-existing --compatibility manylinux2014 --username "$MATURIN_USERNAME" - "${PYBIN}/maturin" publish -b bin -i "${PYBIN}/python" --skip-existing --compatibility musllinux_1_2 --username "$MATURIN_USERNAME" + "${PYBIN}/maturin" publish -b bin -i "${PYBIN}/python" --skip-existing --compatibility manylinux_2_2 done @@ -50,22 +48,19 @@ jobs: - name: "Build and publish wheels" shell: bash env: - MATURIN_USERNAME: ${{ secrets.PYPI_USERNAME_FXP }} - MATURIN_PASSWORD: ${{ secrets.PYPI_PASSWORD_FXP }} + MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN_FXP }} run: | source $HOME/.cargo/env cd crates/cli for PYBIN in /opt/python/cp38*/bin; do "${PYBIN}/pip" install maturin - "${PYBIN}/maturin" publish -b bin -i "${PYBIN}/python" --skip-existing --compatibility manylinux2014 --username "$MATURIN_USERNAME" - "${PYBIN}/maturin" publish -b bin -i "${PYBIN}/python" --skip-existing --compatibility musllinux_1_2 --username "$MATURIN_USERNAME" + "${PYBIN}/maturin" publish -b bin -i "${PYBIN}/python" --skip-existing --compatibility manylinux2014 done build-aarch64-wheels: runs-on: ubuntu-latest env: - MATURIN_USERNAME: ${{ secrets.PYPI_USERNAME_FXP }} - MATURIN_PASSWORD: ${{ secrets.PYPI_PASSWORD_FXP }} + MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN_FXP }} img: quay.io/pypa/manylinux2014_aarch64 steps: - name: Checkout @@ -84,8 +79,7 @@ jobs: cd crates/cli && \ for PYBIN in /opt/python/cp38*/bin; do "${PYBIN}/pip" install maturin - "${PYBIN}/maturin" publish -b bin -i "${PYBIN}/python" --no-dist --skip-existing --compatibility manylinux2014 --username "$MATURIN_USERNAME" --config "net.git-fetch-with-cli = true" - "${PYBIN}/maturin" publish -b bin -i "${PYBIN}/python" --no-dist --skip-existing --compatibility musllinux_1_2 --username "$MATURIN_USERNAME" --config "net.git-fetch-with-cli = true" + "${PYBIN}/maturin" publish -b bin -i "${PYBIN}/python" --no-dist --skip-existing --compatibility manylinux2014 --config "net.git-fetch-with-cli = true" done' @@ -111,13 +105,11 @@ jobs: # line is not the same for macos and for windows. We should create 2 different actions (see # https://docs.github.com/en/actions/reference/encrypted-secrets ) env: - MATURIN_USERNAME: ${{ secrets.PYPI_USERNAME_FXP }} - MATURIN_PASSWORD: ${{ secrets.PYPI_PASSWORD_FXP }} + MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN_FXP }} run: | pip install maturin cd crates/cli - maturin publish -b bin -i python${{matrix.python_version}} --skip-existing --username fxpineau - maturin publish -b bin -i python${{matrix.python_version}} --skip-existing --username fxpineau + maturin publish -b bin -i python${{matrix.python_version}} --skip-existing # Deploy for MacOS 64 bits both X86 and aarch64. build-macos-wheels: @@ -140,11 +132,10 @@ jobs: # line is not the same for macos and for windows. We should create 2 different actions (see # https://docs.github.com/en/actions/reference/encrypted-secrets ) env: - MATURIN_USERNAME: ${{ secrets.PYPI_USERNAME_FXP }} - MATURIN_PASSWORD: ${{ secrets.PYPI_PASSWORD_FXP }} + MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN_FXP }} run: | rustup target add aarch64-apple-darwin pip install maturin cd crates/cli - maturin publish -b bin --interpreter python${{matrix.python_version}} --universal2 --skip-existing --username "$MATURIN_USERNAME" + maturin publish -b bin --interpreter python${{matrix.python_version}} --target universal2-apple-darwin --skip-existing