Skip to content

Commit f9d88d5

Browse files
Bump cookiecutter template to a67c71 (#211)
# Changes - bumped cookiecutter template to robert-koch-institut/mex-template@a67c71 --------- Signed-off-by: Nicolas Drebenstedt <[email protected]> Co-authored-by: Nicolas Drebenstedt <[email protected]>
1 parent 53fb35d commit f9d88d5

File tree

7 files changed

+42
-7
lines changed

7 files changed

+42
-7
lines changed

.cruft.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"template": "https://github.com/robert-koch-institut/mex-template",
3-
"commit": "6009e248d0af40a236c73776716f077c9a9cc313",
3+
"commit": "a67c7163c76384de4f85913f0f6045a41dcd0735",
44
"checkout": null,
55
"context": {
66
"cookiecutter": {
77
"project_name": "release",
88
"short_summary": "Release tools for the RKI MEx project.",
99
"long_summary": "Create a new release, including changelog rollover, project version bump, commit, tag and push.",
1010
"_template": "https://github.com/robert-koch-institut/mex-template",
11-
"_commit": "6009e248d0af40a236c73776716f077c9a9cc313"
11+
"_commit": "a67c7163c76384de4f85913f0f6045a41dcd0735"
1212
}
1313
},
1414
"directory": null
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Check changelog
2+
3+
on:
4+
pull_request:
5+
6+
concurrency:
7+
group: ${{ github.workflow }}-${{ github.ref }}
8+
cancel-in-progress: true
9+
10+
jobs:
11+
check-changelog:
12+
name: Check changelog
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- name: Checkout Repository
17+
uses: actions/checkout@v5
18+
with:
19+
fetch-depth: 0
20+
21+
- name: Check for CHANGELOG.md changes
22+
run: |
23+
if [ "${{ github.actor }}" = "RKIMetadataExchange" ]; then
24+
echo "Actor is 'RKIMetadataExchange'. Skipping changelog check."
25+
exit 0;
26+
fi
27+
28+
if git diff --quiet "origin/${{ github.base_ref }}"...HEAD -- "CHANGELOG.md"; then
29+
echo "Error: The CHANGELOG.md has not been modified."
30+
echo "Please add your changes to CHANGELOG.md before merging."
31+
exit 1
32+
else
33+
echo "CHANGELOG.md has been modified."
34+
exit 0
35+
fi

.github/workflows/cookiecutter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
git checkout -b cruft/cookiecutter-template-${template_ref}
7777
cruft update --skip-apply-ask
7878
printf '# Changes\n\n- bumped cookiecutter template to %s/commit/%s\n' "$template_url" "$template_ref" > .cruft-pr-body
79-
sed -i "0,/^### Changes/s|^### Changes.*|&\n- bumped cookiecutter template to ${template_url}/commit/${template_ref}|" CHANGELOG.md
79+
sed -i "0,/^### Changes/s|^### Changes.*|&\n\n- updated template to ${template_url}/commit/${template_ref}|" CHANGELOG.md
8080
if [[ $(find . -type f -name "*.rej" | wc -l) -ne 0 ]]; then
8181
printf '\n# Conflicts\n' >> .cruft-pr-body
8282
fi

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ concurrency:
3232
jobs:
3333
release:
3434
runs-on: ubuntu-latest
35-
timeout-minutes: 10
35+
timeout-minutes: 15
3636
outputs:
3737
tag: ${{ steps.release.outputs.tag }}
3838
steps:

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ default_language_version:
33
python: python3.11
44
repos:
55
- repo: https://github.com/astral-sh/ruff-pre-commit
6-
rev: v0.14.0
6+
rev: v0.14.5
77
hooks:
88
- id: ruff-check
99
args: [--fix, --exit-non-zero-on-fix]
@@ -25,7 +25,7 @@ repos:
2525
- id: fix-byte-order-marker
2626
name: byte-order
2727
- repo: https://github.com/pdm-project/pdm
28-
rev: 2.25.9
28+
rev: 2.26.1
2929
hooks:
3030
- id: pdm-lock-check
3131
name: pdm

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010
### Added
1111

1212
### Changes
13+
- bumped cookiecutter template to https://github.com/robert-koch-institut/mex-template/commit/a67c71
1314
- bumped cookiecutter template to https://github.com/robert-koch-institut/mex-template/commit/6009e2
1415
- bumped cookiecutter template to https://github.com/robert-koch-institut/mex-template/commit/3c389d
1516

requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@ cruft==2.16.0
22
mex-release==0.3.5
33
pdm==2.26.1
44
pre-commit==4.4.0
5-
hishel<1

0 commit comments

Comments
 (0)