Skip to content

Commit

Permalink
Merge pull request #8 from voxpupuli/modulesync
Browse files Browse the repository at this point in the history
Update to module template files
  • Loading branch information
rwaffen authored Sep 3, 2024
2 parents 0075e35 + 0168975 commit bb1a939
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 20 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
---
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

name: Labeler 🏷️

on:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
---
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

name: Release 🚀

on:
Expand Down
23 changes: 4 additions & 19 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@ export RELEASE_VERSION="X.Y.Z"
git switch main
git pull -r
git switch -c release-v$RELEASE_VERSION

bundle config set --local path vendor/bundle
bundle config set --local with 'release'
bundle install

CHANGELOG_GITHUB_TOKEN="token_MC_tokenface" bundle exec rake changelog
git commit -am "Release v${RELEASE_VERSION}"
git push origin release-v$RELEASE_VERSION
Expand All @@ -26,24 +29,6 @@ Then open a PR, discuss and merge.
```shell
git switch main
git pull -r
git tag v$RELEASE_VERSION
git tag v$RELEASE_VERSION -m "v$RELEASE_VERSION"
git push --tags
```

## Tags

Each puppetserver and puppetdb is accompanied by a build_versions.json file
containing information about puppet releases and versions built when a tag is pushed or a change is made to the main branch.

To enhance clarity and organization, we are transitioning from our previous tagging approach
and will now distinguish the container tag from the puppet version.
The new tags will follow the format vX.Y.Z. The CI build process operates within a matrix,
leveraging the data from the JSON file to construct the specified versions.
As a result, two Docker tags are currently generated: 7.13.0-vX.Y.Z corresponds to
the Puppet Release 7.13.0 build with container version X.Y.Z, while 8.10.0-vX.Y.Z aligns
with Release 8.10.0. These tags offer a more streamlined and informative representation of our build versions.

The container tags like `7.13.0-main` and `8.10.0-main` are built automatically
whenever changes are merged into the Git main branch.
It's important to note that these tags are designated as development tags
and might be subject to breakage, so exercise caution when using them.
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ rescue LoadError
else
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
config.header = "# Changelog\n\nAll notable changes to this project will be documented in this file."
config.exclude_labels = %w[duplicate question invalid wontfix wont-fix skip-changelog modulesync github_actions]
config.exclude_labels = %w[duplicate question invalid wontfix wont-fix skip-changelog modulesync github_actions]
config.user = 'voxpupuli'
config.project = 'container-test'
# get branch name from git and strip off any prefixes (e.g. 'release-')
Expand Down

0 comments on commit bb1a939

Please sign in to comment.