From 1936b521e3646bcabb5f488ed87b6942ab42c6a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Budy=C5=9B?= Date: Sat, 22 Jun 2024 00:35:11 +0200 Subject: [PATCH 1/5] add pypi workflow --- .github/workflows/publish-to-pypi.yml | 117 ++++++++++++++++++++++++++ manga_ocr/_version.py | 2 +- 2 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/publish-to-pypi.yml diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml new file mode 100644 index 0000000..a52acb0 --- /dev/null +++ b/.github/workflows/publish-to-pypi.yml @@ -0,0 +1,117 @@ +name: Publish Python 🐍 distribution 📦 to PyPI and TestPyPI + +on: push + +jobs: + build: + name: Build distribution 📦 + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: "3.x" + - name: Install pypa/build + run: >- + python3 -m + pip install + build + --user + - name: Build a binary wheel and a source tarball + run: python3 -m build + - name: Store the distribution packages + uses: actions/upload-artifact@v3 + with: + name: python-package-distributions + path: dist/ + + publish-to-pypi: + name: >- + Publish Python 🐍 distribution 📦 to PyPI + if: startsWith(github.ref, 'refs/tags/') # only publish to PyPI on tag pushes + needs: + - build + runs-on: ubuntu-latest + environment: + name: pypi + url: https://pypi.org/p/manga-ocr # Replace with your PyPI project name + permissions: + id-token: write # IMPORTANT: mandatory for trusted publishing + + steps: + - name: Download all the dists + uses: actions/download-artifact@v3 + with: + name: python-package-distributions + path: dist/ + - name: Publish distribution 📦 to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 + + github-release: + name: >- + Sign the Python 🐍 distribution 📦 with Sigstore + and upload them to GitHub Release + needs: + - publish-to-pypi + runs-on: ubuntu-latest + + permissions: + contents: write # IMPORTANT: mandatory for making GitHub Releases + id-token: write # IMPORTANT: mandatory for sigstore + + steps: + - name: Download all the dists + uses: actions/download-artifact@v3 + with: + name: python-package-distributions + path: dist/ + - name: Sign the dists with Sigstore + uses: sigstore/gh-action-sigstore-python@v2.1.1 + with: + inputs: >- + ./dist/*.tar.gz + ./dist/*.whl + - name: Create GitHub Release + env: + GITHUB_TOKEN: ${{ github.token }} + run: >- + gh release create + '${{ github.ref_name }}' + --repo '${{ github.repository }}' + --notes "" + - name: Upload artifact signatures to GitHub Release + env: + GITHUB_TOKEN: ${{ github.token }} + # Upload to GitHub Release using the `gh` CLI. + # `dist/` contains the built packages, and the + # sigstore-produced signatures and certificates. + run: >- + gh release upload + '${{ github.ref_name }}' dist/** + --repo '${{ github.repository }}' + + publish-to-testpypi: + name: Publish Python 🐍 distribution 📦 to TestPyPI + needs: + - build + runs-on: ubuntu-latest + + environment: + name: testpypi + url: https://test.pypi.org/p/manga-ocr + + permissions: + id-token: write # IMPORTANT: mandatory for trusted publishing + + steps: + - name: Download all the dists + uses: actions/download-artifact@v3 + with: + name: python-package-distributions + path: dist/ + - name: Publish distribution 📦 to TestPyPI + uses: pypa/gh-action-pypi-publish@release/v1 + with: + repository-url: https://test.pypi.org/legacy/ \ No newline at end of file diff --git a/manga_ocr/_version.py b/manga_ocr/_version.py index 0c5c300..0684008 100644 --- a/manga_ocr/_version.py +++ b/manga_ocr/_version.py @@ -1 +1 @@ -__version__ = "0.1.11" +__version__ = "0.1.12-beta.1" From c5e86273f7bc69770ddf562e9b216f190ca65bd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Budy=C5=9B?= Date: Sat, 22 Jun 2024 00:42:36 +0200 Subject: [PATCH 2/5] publish only on master --- .github/workflows/publish-to-pypi.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index a52acb0..df953d0 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -1,6 +1,8 @@ name: Publish Python 🐍 distribution 📦 to PyPI and TestPyPI -on: push +on: + push: + branches: [ "master" ] jobs: build: From b824d011627e61a5d325528fe92b2899c3ff39be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Budy=C5=9B?= Date: Sat, 22 Jun 2024 00:44:50 +0200 Subject: [PATCH 3/5] rename jobs --- .github/workflows/publish-to-pypi.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index df953d0..756da98 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -1,4 +1,4 @@ -name: Publish Python 🐍 distribution 📦 to PyPI and TestPyPI +name: Publish package to PyPI and TestPyPI on: push: @@ -6,7 +6,7 @@ on: jobs: build: - name: Build distribution 📦 + name: Build dist runs-on: ubuntu-latest steps: @@ -31,7 +31,7 @@ jobs: publish-to-pypi: name: >- - Publish Python 🐍 distribution 📦 to PyPI + Publish to PyPI if: startsWith(github.ref, 'refs/tags/') # only publish to PyPI on tag pushes needs: - build @@ -48,12 +48,12 @@ jobs: with: name: python-package-distributions path: dist/ - - name: Publish distribution 📦 to PyPI + - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 github-release: name: >- - Sign the Python 🐍 distribution 📦 with Sigstore + Sign with Sigstore and upload them to GitHub Release needs: - publish-to-pypi @@ -95,7 +95,7 @@ jobs: --repo '${{ github.repository }}' publish-to-testpypi: - name: Publish Python 🐍 distribution 📦 to TestPyPI + name: Publish to TestPyPI needs: - build runs-on: ubuntu-latest @@ -113,7 +113,7 @@ jobs: with: name: python-package-distributions path: dist/ - - name: Publish distribution 📦 to TestPyPI + - name: Publish to TestPyPI uses: pypa/gh-action-pypi-publish@release/v1 with: repository-url: https://test.pypi.org/legacy/ \ No newline at end of file From 9fc067cde153fe6eb83703fc33fa8c52f98b8dd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Budy=C5=9B?= Date: Sat, 22 Jun 2024 00:45:41 +0200 Subject: [PATCH 4/5] bump version --- manga_ocr/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manga_ocr/_version.py b/manga_ocr/_version.py index 0684008..1e1d732 100644 --- a/manga_ocr/_version.py +++ b/manga_ocr/_version.py @@ -1 +1 @@ -__version__ = "0.1.12-beta.1" +__version__ = "0.1.12-beta.2" From 9519a1ed9667185445c4178569d66832083f39e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Budy=C5=9B?= Date: Sat, 22 Jun 2024 00:50:24 +0200 Subject: [PATCH 5/5] rename job --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7f2857f..cf778f8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ permissions: contents: read jobs: - build: + test: runs-on: ubuntu-latest steps: