Skip to content

Commit 8748e20

Browse files
authored
Improve autorelase (#4947)
* fix tty * fix tty
1 parent 61abee3 commit 8748e20

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

.github/workflows/release.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ jobs:
3434
name: Publish
3535
needs: [run_other_workflows]
3636
runs-on: ubuntu-latest
37+
permissions:
38+
# Give the default GITHUB_TOKEN write permission to commit and push the
39+
# added or changed files to the repository.
40+
contents: write
3741
steps:
3842
- uses: actions/checkout@v5
3943
- name: Prepare release
@@ -42,12 +46,12 @@ jobs:
4246
make release version=${{ github.event.inputs.version }}
4347
4448
- name: Commit prepare release changes
45-
run: |
46-
git config --local user.email "
47-
git config --local user.name "github-actions[bot]"
48-
git add .
49-
git commit -m "Release ${{ github.event.inputs.version }}"
50-
49+
uses: stefanzweifel/git-auto-commit-action@v4
50+
with:
51+
# Optional. Commit message for the created commit.
52+
# Defaults to "Apply automatic changes"
53+
commit_message: "Prepare release ${{ github.event.inputs.version }}"
54+
tagging_message: ${{ github.event.inputs.version }}
5155
# - name: Tag, push and create associated new release with auto generated notes
5256
# run: |
5357
# git tag ${{ github.event.inputs.version }}

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ build_deb:
5656

5757
release:
5858
docker build -t geotrek_release -f ./docker/Dockerfile.debian.builder --target base .
59-
docker run --name geotrek_release -v ./debian:/dpkg-build/debian -it geotrek_release bash -c "dch -M -v $(version) -D RELEASED --force-distribution -m \"New package release\""
59+
docker run --name geotrek_release -v ./debian:/dpkg-build/debian -t geotrek_release bash -c "dch -M -v $(version) -D RELEASED --force-distribution -m \"New package release\""
6060
echo "$(version)" > geotrek/VERSION
6161
sed -i "s/.*+dev/$(version)+dev/g" docs/changelog.rst
6262
sed -i 's/+dev/ /g' docs/changelog.rst
@@ -66,7 +66,7 @@ release:
6666

6767
back_to_dev:
6868
docker build -t geotrek_release -f ./docker/Dockerfile.debian.builder --target base .
69-
docker run --name geotrek_release -v ./debian:/dpkg-build/debian -it geotrek_release bash -c "dch -M -v $(version)+dev --no-force-save-on-release -m \"Merging improvements\""
69+
docker run --name geotrek_release -v ./debian:/dpkg-build/debian -t geotrek_release bash -c "dch -M -v $(version)+dev --no-force-save-on-release -m \"Merging improvements\""
7070
echo "$(version)+dev" > geotrek/VERSION
7171
sed -i '4a $(version)+dev (XXXX-XX-XX)\n----------------------------\n\n' docs/changelog.rst
7272
docker stop geotrek_release

docker/Dockerfile.debian.builder

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG DISTRO=ubuntu:focal
1+
ARG DISTRO=ubuntu:noble
22

33
FROM ${DISTRO} AS base
44

0 commit comments

Comments
 (0)