From cbab3a5c9b35dfe0f45d999705fd7b2b95838473 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 14 Dec 2023 18:57:19 +1100 Subject: [PATCH 1/9] Removed "Success" job, as this is not used in mergify --- .github/workflows/wheels.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 76d42b4709a..0ce68906677 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -194,13 +194,3 @@ jobs: with: name: dist path: dist/*.tar.gz - - success: - permissions: - contents: none - needs: [build, windows, sdist] - runs-on: ubuntu-latest - name: Wheels Successful - steps: - - name: Success - run: echo Wheels Successful From 6693046143071b86c586544aa43f61fa600dc2ba Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 14 Dec 2023 19:02:48 +1100 Subject: [PATCH 2/9] Added trusted PyPI publishing --- .github/workflows/wheels.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 0ce68906677..3162f135c4d 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -194,3 +194,17 @@ jobs: with: name: dist path: dist/*.tar.gz + + pypi-publish: + if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') + needs: [build, windows, sdist] + runs-on: ubuntu-latest + name: Upload release to PyPI + environment: + name: pypi + url: https://pypi.org/p/Pillow + permissions: + id-token: write + steps: + - name: Publish package distributions to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 From c81beb5164f4d20c842ce310ecd80ae6df18416c Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Fri, 15 Dec 2023 07:55:26 +1100 Subject: [PATCH 3/9] Updated step name Co-authored-by: Hugo van Kemenade --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 3162f135c4d..59d4bbaaf88 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -206,5 +206,5 @@ jobs: permissions: id-token: write steps: - - name: Publish package distributions to PyPI + - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 From 808f312c7a2e3ba9354740720a4108440b51ffe5 Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Fri, 15 Dec 2023 21:32:33 +1100 Subject: [PATCH 4/9] Updated environment name Co-authored-by: Hugo van Kemenade --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 59d4bbaaf88..b36d7f27869 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -201,7 +201,7 @@ jobs: runs-on: ubuntu-latest name: Upload release to PyPI environment: - name: pypi + name: release-pypi url: https://pypi.org/p/Pillow permissions: id-token: write From fc1cf9f65bda946eabd586c63b3d71aa1bd06043 Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Wed, 20 Dec 2023 09:04:41 +1100 Subject: [PATCH 5/9] Published to Test PyPI Co-authored-by: Hugo van Kemenade --- .github/workflows/wheels.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index b36d7f27869..4b72f2c1de6 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -208,3 +208,5 @@ jobs: steps: - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 + with: + repository-url: https://test.pypi.org/legacy/ From 97c2b6672c6029063121275fd544872fd81e51e1 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 24 Dec 2023 13:42:57 +1100 Subject: [PATCH 6/9] Updated actions/upload-artifact to v4 --- .github/workflows/wheels.yml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 4b72f2c1de6..25520bb323d 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -75,9 +75,9 @@ jobs: CIBW_TEST_SKIP: "*-macosx_arm64" MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macosx_deployment_target }} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: - name: dist + name: dist-${{ matrix.os }}-${{ matrix.archs }}-${{ matrix.manylinux }} path: ./wheelhouse/*.whl windows: @@ -157,9 +157,9 @@ jobs: shell: cmd - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: dist + name: dist-${{ matrix.arch }} path: ./wheelhouse/*.whl - name: Prepare to upload FriBiDi @@ -171,9 +171,9 @@ jobs: - name: Upload fribidi.dll if: "matrix.arch != 'ARM64'" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: fribidi + name: fribidi-${{ matrix.arch }} path: fribidi\* sdist: @@ -190,9 +190,9 @@ jobs: - run: make sdist - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: - name: dist + name: dist-sdist path: dist/*.tar.gz pypi-publish: @@ -206,6 +206,11 @@ jobs: permissions: id-token: write steps: + - uses: actions/download-artifact@v4 + with: + pattern: dist-* + path: dist + merge-multiple: true - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: From 2b806c5236e2b4de1ad02e57687cca40ecaf57d4 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 25 Dec 2023 07:19:00 +1100 Subject: [PATCH 7/9] Removed trailing dash --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 25520bb323d..55c41b595dc 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -77,7 +77,7 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: dist-${{ matrix.os }}-${{ matrix.archs }}-${{ matrix.manylinux }} + name: dist-${{ matrix.os }}-${{ matrix.archs }}${{ matrix.manylinux && format('-{0}', matrix.manylinux) }} path: ./wheelhouse/*.whl windows: From a66fbb95b6239c20ca9d6a42ca5b8448fc461984 Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Wed, 27 Dec 2023 07:54:03 +1100 Subject: [PATCH 8/9] Updated Windows artifact name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Ondrej Baranovič --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index c73cdb2c6c9..6149aa1ec0b 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -156,7 +156,7 @@ jobs: - name: Upload wheels uses: actions/upload-artifact@v4 with: - name: dist-${{ matrix.arch }} + name: dist-windows-${{ matrix.arch }} path: ./wheelhouse/*.whl - name: Upload fribidi.dll From 043e13d660f1000e3a8ba3f1e84fd8e2b9ddd135 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 27 Dec 2023 08:12:51 +1100 Subject: [PATCH 9/9] Revert "Published to Test PyPI" This reverts commit fc1cf9f65bda946eabd586c63b3d71aa1bd06043. --- .github/workflows/wheels.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 6149aa1ec0b..060fc497ea7 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -202,5 +202,3 @@ jobs: merge-multiple: true - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 - with: - repository-url: https://test.pypi.org/legacy/