From 5e09568407ad6fe29a34013b791a17ebebd4e526 Mon Sep 17 00:00:00 2001
From: Robert Waffen <rwaffen@gmail.com>
Date: Fri, 19 Apr 2024 12:48:04 +0200
Subject: [PATCH] Release v1.1.0

---
 CHANGELOG.md | 16 ++++++++++++++++
 RELEASE.md   | 15 +++++++++------
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6129004..54c8daf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file.
 
+## [v1.1.0](https://github.com/voxpupuli/container-voxbox/tree/v1.1.0) (2024-04-19)
+
+[Full Changelog](https://github.com/voxpupuli/container-voxbox/compare/v1.0.0...v1.1.0)
+
+**Implemented enhancements:**
+
+- update puppet to 7.30.0 and 8.6.0, facter to 4.7.0 and r10k to 4.1.0 [\#8](https://github.com/voxpupuli/container-voxbox/pull/8) ([rwaffen](https://github.com/rwaffen))
+
+**Merged pull requests:**
+
+- Update GitHub actions: Labeler, Add Release workflow, try to fix trivy [\#9](https://github.com/voxpupuli/container-voxbox/pull/9) ([rwaffen](https://github.com/rwaffen))
+- remove artifacts from gitlab example [\#7](https://github.com/voxpupuli/container-voxbox/pull/7) ([rwaffen](https://github.com/rwaffen))
+- fix wrong file name of gitlab-ci.yml [\#6](https://github.com/voxpupuli/container-voxbox/pull/6) ([rwaffen](https://github.com/rwaffen))
+- update README.md to highlight build\_versions.json and add .gitlab-ci.yaml example [\#5](https://github.com/voxpupuli/container-voxbox/pull/5) ([rwaffen](https://github.com/rwaffen))
+- Use more precise container image names and add rubocop-performance [\#4](https://github.com/voxpupuli/container-voxbox/pull/4) ([rwaffen](https://github.com/rwaffen))
+
 ## [v1.0.0](https://github.com/voxpupuli/container-voxbox/tree/v1.0.0) (2024-03-27)
 
 [Full Changelog](https://github.com/voxpupuli/container-voxbox/compare/ac1461e6cb5c9f365632f39b551bfd510aeea1ba...v1.0.0)
diff --git a/RELEASE.md b/RELEASE.md
index db62f66..a2daf6b 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,5 +1,7 @@
 # How to make a release
 
+## On a fork
+
 Initiate a Release Pull Request (PR). Ensure that the release branch includes the version in its name, as this will be utilized as the `future_version` for the GitHub changelog generator.
 
 See Rakefile
@@ -8,12 +10,13 @@ See Rakefile
     config.future_release = `git rev-parse --abbrev-ref HEAD`.strip.split('-', 2).last
 ```
 
-On a fork create a release PR:
+Do the following:
 
 ```shell
+export RELEASE_VERSION="X.Y.Z"
 git switch main
 git pull -r
-git switch -c release-vX.Y.Z
+git switch -c release-v$RELEASE_VERSION
 
 bundle config set --local path vendor/bundle
 bundle config set --local with 'release'
@@ -21,15 +24,15 @@ bundle install
 
 CHANGELOG_GITHUB_TOKEN="token_MC_tokenface" bundle exec rake changelog
 
-git commit -am 'Release vX.Y.Z'
-git push origin release-vX.Y.Z
+git commit -am "Release v${RELEASE_VERSION}"
+git push origin release-v$RELEASE_VERSION
 ```
 
-After the merge as a maintainer on origin do:
+## After the merge, as a maintainer on upstream
 
 ```shell
 git switch main
 git pull -r
-git tag vX.Y.Z
+git tag v$RELEASE_VERSION
 git push --tags
 ```