From d4fc4357ccc32c746d46b53f68f840b2fe8391dc Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 16 Oct 2023 15:42:52 +0200 Subject: [PATCH] chore: replace git-chglog by git-sv (#281) --- .chglog/CHANGELOG.tpl.md | 23 ---------------- .chglog/config.yml | 25 ------------------ .gitsv/config.yml | 47 +++++++++++++++++++++++++++++++++ .woodpecker/build-container.yml | 2 +- .woodpecker/build-package.yml | 20 ++++++-------- .woodpecker/lint.yml | 4 +-- .woodpecker/test.yml | 6 +---- 7 files changed, 59 insertions(+), 68 deletions(-) delete mode 100755 .chglog/CHANGELOG.tpl.md delete mode 100755 .chglog/config.yml create mode 100644 .gitsv/config.yml diff --git a/.chglog/CHANGELOG.tpl.md b/.chglog/CHANGELOG.tpl.md deleted file mode 100755 index b79faa8..0000000 --- a/.chglog/CHANGELOG.tpl.md +++ /dev/null @@ -1,23 +0,0 @@ -# Changelog - -{{ range .Versions -}} -## {{ if .Tag.Previous }}[{{ .Tag.Name }}]({{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}){{ else }}{{ .Tag.Name }}{{ end }} ({{ datetime "2006-01-02" .Tag.Date }}) - -{{ range .CommitGroups -}} -### {{ .Title }} - -{{ range .Commits -}} -- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ (regexReplaceAll "(.*)/issues/(.*)" (regexReplaceAll "(Co-\\w*-by.*)" .Subject "") "${1}/pull/${2}") | trim }} -{{ end }} -{{- end -}} - -{{- if .NoteGroups -}} -{{ range .NoteGroups -}} -### {{ .Title }} - -{{ range .Notes }} -{{ .Body }} -{{ end }} -{{ end -}} -{{ end -}} -{{ end -}} diff --git a/.chglog/config.yml b/.chglog/config.yml deleted file mode 100755 index 0c7f5f2..0000000 --- a/.chglog/config.yml +++ /dev/null @@ -1,25 +0,0 @@ -style: github -template: CHANGELOG.tpl.md -info: - title: CHANGELOG - repository_url: https://github.com/thegeeklab/docker-autotag -options: - commit_groups: - title_maps: - feat: Features - fix: Bug Fixes - perf: Performance Improvements - refactor: Code Refactoring - chore: Others - test: Testing - ci: CI Pipeline - docs: Documentation - header: - pattern: "^(\\w*)(?:\\(([\\w\\$\\.\\-\\*\\s]*)\\))?\\:\\s(.*)$" - pattern_maps: - - Type - - Scope - - Subject - notes: - keywords: - - BREAKING CHANGE diff --git a/.gitsv/config.yml b/.gitsv/config.yml new file mode 100644 index 0000000..7b9cae5 --- /dev/null +++ b/.gitsv/config.yml @@ -0,0 +1,47 @@ +--- +version: "1.1" + +versioning: + update-major: [] + update-minor: [feat] + update-patch: [fix, perf, refactor, chore, test, ci, docs] + +tag: + pattern: "v%d.%d.%d" + +release-notes: + sections: + - name: Features + commit-types: [feat] + section-type: commits + - name: Bug Fixes + commit-types: [fix] + section-type: commits + - name: Performance Improvements + commit-types: [perf] + section-type: commits + - name: Code Refactoring + commit-types: [refactor] + section-type: commits + - name: Others + commit-types: [chore] + section-type: commits + - name: Testing + commit-types: [test] + section-type: commits + - name: CI Pipeline + commit-types: [ci] + section-type: commits + - name: Documentation + commit-types: [docs] + section-type: commits + - name: Breaking Changes + section-type: breaking-changes + +commit-message: + footer: + issue: + key: issue + add-value-prefix: "#" + issue: + regex: "#?[0-9]+" diff --git a/.woodpecker/build-container.yml b/.woodpecker/build-container.yml index 9537803..a2b3022 100644 --- a/.woodpecker/build-container.yml +++ b/.woodpecker/build-container.yml @@ -9,7 +9,7 @@ steps: build: image: docker.io/library/python:3.12 commands: - - git fetch -tq + - git fetch --depth=2147483647 - pip install poetry poetry-dynamic-versioning -qq - poetry build diff --git a/.woodpecker/build-package.yml b/.woodpecker/build-package.yml index 4c3e10d..557cbbf 100644 --- a/.woodpecker/build-package.yml +++ b/.woodpecker/build-package.yml @@ -9,7 +9,7 @@ steps: build: image: docker.io/library/python:3.12 commands: - - git fetch -tq + - git fetch --depth=2147483647 - pip install poetry poetry-dynamic-versioning -qq - poetry build @@ -18,17 +18,13 @@ steps: commands: - cd dist/ && sha256sum * > ../sha256sum.txt - changelog-generate: - image: quay.io/thegeeklab/git-chglog + changelog: + image: quay.io/thegeeklab/git-sv commands: - - git fetch -tq - - git-chglog --no-color --no-emoji -o CHANGELOG.md ${CI_COMMIT_TAG:---next-tag unreleased unreleased} - - changelog-format: - image: quay.io/thegeeklab/alpine-tools - commands: - - prettier CHANGELOG.md - - prettier -w CHANGELOG.md + - git fetch --depth=2147483647 + - git sv current-version + - git sv release-notes + - git sv release-notes -o CHANGELOG.md publish-github: image: docker.io/plugins/github-release @@ -52,7 +48,7 @@ steps: - source: pypi_username target: POETRY_HTTP_BASIC_PYPI_USERNAME commands: - - git fetch -tq + - git fetch --depth=2147483647 - pip install poetry poetry-dynamic-versioning -qq - poetry publish -n when: diff --git a/.woodpecker/lint.yml b/.woodpecker/lint.yml index afac23d..76d46a0 100644 --- a/.woodpecker/lint.yml +++ b/.woodpecker/lint.yml @@ -9,7 +9,7 @@ steps: check-format: image: docker.io/library/python:3.12 commands: - - git fetch -tq + - git fetch --depth=2147483647 - pip install poetry poetry-dynamic-versioning -qq - poetry install - poetry run yapf -dr ./${CI_REPO_NAME//-/} @@ -19,7 +19,7 @@ steps: check-coding: image: docker.io/library/python:3.12 commands: - - git fetch -tq + - git fetch --depth=2147483647 - pip install poetry poetry-dynamic-versioning -qq - poetry install - poetry run ruff ./${CI_REPO_NAME//-/} diff --git a/.woodpecker/test.yml b/.woodpecker/test.yml index 9581961..fe5d5f2 100644 --- a/.woodpecker/test.yml +++ b/.woodpecker/test.yml @@ -15,14 +15,10 @@ matrix: - docker.io/library/python:3.12 steps: - fetch: - image: docker.io/library/python:3.12 - commands: - - git fetch -tq - pytest: image: ${PYTHON_VERSION} commands: + - git fetch --depth=2147483647 - pip install poetry poetry-dynamic-versioning -qq - poetry install - poetry version