From 3c13dd1e48a5831a587c4cf7c7e9ee2cba5fa295 Mon Sep 17 00:00:00 2001 From: emil Date: Sat, 27 Jun 2026 22:16:49 +0200 Subject: [PATCH 1/2] fix: add skip-ci flag to release commits and concurrency to build-images --- .gitea/workflows/build-images.yml | 4 ++++ src/devx/ci/release.py | 4 ++-- src/devx/translations.json | 14 +++++++------- tests/unit/test_release.py | 4 ++-- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/build-images.yml b/.gitea/workflows/build-images.yml index 2cd9af1..4b330d6 100644 --- a/.gitea/workflows/build-images.yml +++ b/.gitea/workflows/build-images.yml @@ -23,6 +23,10 @@ on: - src/devx/** workflow_dispatch: +concurrency: + group: build-images + cancel-in-progress: false + jobs: detect-type: runs-on: docker diff --git a/src/devx/ci/release.py b/src/devx/ci/release.py index c723235..267a441 100644 --- a/src/devx/ci/release.py +++ b/src/devx/ci/release.py @@ -279,7 +279,7 @@ def commit_release_changes(new_version: str) -> bool: if status.returncode == 0: click.echo(_("No staged changes — version and changelog already up to date.")) return False - run_cmd(["git", "commit", "--no-verify", "-m", f"release: v{new_version}"]) + run_cmd(["git", "commit", "--no-verify", "-m", f"release: v{new_version} [skip ci]"]) return True @@ -705,7 +705,7 @@ def main(dry_run: bool, skip_tests: bool, verify: bool) -> None: click.echo(_("\n[dry-run] Changelog:\n{changelog}", changelog=changelog)) click.echo(_("[dry-run] Would update {init}", init=INIT_FILE)) click.echo(_("[dry-run] Would update {changelog_file}", changelog_file=CHANGELOG_FILE)) - click.echo(_("[dry-run] Would commit: release: v{version}", version=new_version)) + click.echo(_("[dry-run] Would commit: release: v{version} [skip ci]", version=new_version)) click.echo(_("[dry-run] Would push commit to master")) click.echo(_("[dry-run] Would create tag: v{version}", version=new_version)) return diff --git a/src/devx/translations.json b/src/devx/translations.json index f3460cf..163e97e 100644 --- a/src/devx/translations.json +++ b/src/devx/translations.json @@ -1799,13 +1799,13 @@ "ru": "[check_test_coverage] No changed files to check.", "zh": "[check_test_coverage] No changed files to check." }, - "[dry-run] Would commit: release: v{version}": { - "bg": "[dry-run] Would commit: release: v{version}", - "de": "[dry-run] Would commit: release: v{version}", - "en": "[dry-run] Would commit: release: v{version}", - "pl": "[dry-run] Utworzono by commit: release: v{version}", - "ru": "[dry-run] Would commit: release: v{version}", - "zh": "[dry-run] Would commit: release: v{version}" + "[dry-run] Would commit: release: v{version} [skip ci]": { + "bg": "[dry-run] Would commit: release: v{version} [skip ci]", + "de": "[dry-run] Would commit: release: v{version} [skip ci]", + "en": "[dry-run] Would commit: release: v{version} [skip ci]", + "pl": "[dry-run] Utworzono by commit: release: v{version} [skip ci]", + "ru": "[dry-run] Would commit: release: v{version} [skip ci]", + "zh": "[dry-run] Would commit: release: v{version} [skip ci]" }, "[dry-run] Would create tag: v{version}": { "bg": "[dry-run] Would create tag: v{version}", diff --git a/tests/unit/test_release.py b/tests/unit/test_release.py index d07f589..9dd7332 100644 --- a/tests/unit/test_release.py +++ b/tests/unit/test_release.py @@ -802,7 +802,7 @@ class TestCommitReleaseChanges: assert result is True calls = [c.args[0] for c in mock_run_cmd.call_args_list] assert ["git", "add", "src/devx/__init__.py", "CHANGELOG.md"] in calls - assert ["git", "commit", "--no-verify", "-m", "release: v0.2.0"] in calls + assert ["git", "commit", "--no-verify", "-m", "release: v0.2.0 [skip ci]"] in calls @patch("devx.ci.release.run_cmd") def test_skips_when_no_changes(self, mock_run_cmd: MagicMock) -> None: @@ -811,7 +811,7 @@ class TestCommitReleaseChanges: result = commit_release_changes("0.1.0") assert result is False calls = [c.args[0] for c in mock_run_cmd.call_args_list] - assert ["git", "commit", "--no-verify", "-m", "release: v0.1.0"] not in calls + assert ["git", "commit", "--no-verify", "-m", "release: v0.1.0 [skip ci]"] not in calls class TestCreateAndPushTag: -- 2.54.0 From 183aac5cc2a47a7a62a629e5f0bf95552ef447a6 Mon Sep 17 00:00:00 2001 From: emil Date: Sat, 27 Jun 2026 23:18:11 +0200 Subject: [PATCH 2/2] ci: trigger workflow -- 2.54.0