From 693936338f76ded727816bd384cac3e426967ce4 Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Mon, 6 Apr 2026 22:20:14 +0300 Subject: [PATCH 1/4] Add Makefile target to build package --- .github/workflows/testing.yml | 19 +++++++++++++++++++ Makefile | 18 +++++++++++++++--- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index ee2f4fb..4dd74b0 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -29,6 +29,25 @@ jobs: ./node_modules/.bin/eslint . -c package.json + build-package: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: [3.11] + + steps: + - uses: actions/checkout@v4 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} + + - name: Build me + run: | + pip install -U pip "setuptools<82" wheel twine + + make package + postgres: runs-on: ubuntu-latest strategy: diff --git a/Makefile b/Makefile index e4a33b6..db7429e 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2024 Alexander Todorov +# Copyright (c) 2019-2026 Alexander Todorov # # Licensed under GNU Affero General Public License v3 or later (AGPLv3+) # https://www.gnu.org/licenses/agpl-3.0.html @@ -59,10 +59,22 @@ messages: check: flake8 pylint test -.PHONY: test-via-docker -test-via-docker: +.PHONY: package +package: rm -rf build/ dist/ kiwitcms_github_marketplace.egg-info/ + python setup.py sdist python setup.py bdist_wheel + twine check dist/* + + +.PHONY: test-via-docker +test-via-docker: package docker build -f Dockerfile.testing -t kiwitcms/github-marketplace:latest . docker images test_project/sanity-check.sh + +.PHONY: upload +upload: package + test -n "$(TWINE_USERNAME)" || exit 1 + test -n "$(TWINE_PASSWORD)" || exit 2 + twine upload dist/* --repository-url https://push.fury.io/kiwitcms From 09be854792164c4f4b1a06670744181cc9763f78 Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Mon, 6 Apr 2026 22:26:20 +0300 Subject: [PATCH 2/4] Add workflow to publish a package --- .github/workflows/publish-package.yml | 32 +++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/publish-package.yml diff --git a/.github/workflows/publish-package.yml b/.github/workflows/publish-package.yml new file mode 100644 index 0000000..98a4411 --- /dev/null +++ b/.github/workflows/publish-package.yml @@ -0,0 +1,32 @@ +name: publish-package + +on: + push: + tags: + - v* + +permissions: read-all + +jobs: + publish-package: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: [3.11] + + steps: + - uses: actions/checkout@v4 + + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} + + - name: Build and push + env: + TWINE_USERNAME: ${{ secrets.GEMFURY_USERNAME }} + TWINE_PASSWORD: ${{ secrets.GEMFURY_PUSH_TOKEN }} + run: | + pip install -U pip "setuptools<82" twine wheel + + make upload From b5fa20abc7a330456c29026b36bd3f37596caaff Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Mon, 6 Apr 2026 22:26:49 +0300 Subject: [PATCH 3/4] Changelog for v4.5.1 --- README.rst | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 4625980..5a19a75 100644 --- a/README.rst +++ b/README.rst @@ -65,7 +65,7 @@ Product configuration Changelog --------- -v4.5.0 (06 Apr 2026) +v4.5.1 (06 Apr 2026) ~~~~~~~~~~~~~~~~~~~~ - Add model ``PrivateRepoToken`` diff --git a/setup.py b/setup.py index 831074d..a0f71dc 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ def get_install_requires(path): setup( name="kiwitcms-github-marketplace", - version="4.5.0", + version="4.5.1", description="GitHub Marketplace integration for Kiwi TCMS", long_description=get_long_description(), author="Kiwi TCMS", From 0298122eb374426b07cb470fc6974f2df4bf1dd7 Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Mon, 6 Apr 2026 22:30:44 +0300 Subject: [PATCH 4/4] Cancel CI jobs in progress --- .github/workflows/testing.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 4dd74b0..062450f 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -5,6 +5,10 @@ on: branches: master pull_request: +concurrency: + group: ${{ github.ref }}-${{ github.workflow }} + cancel-in-progress: true + jobs: black: runs-on: ubuntu-latest