Skip to content

Commit 7014c6f

Browse files
committed
Update from voxpupuli modulesync_config
1 parent ce7e4e4 commit 7014c6f

File tree

10 files changed

+53
-15
lines changed

10 files changed

+53
-15
lines changed

.github/CODEOWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
14
# No matter which file got changed, request a review from the main developers
25
* @voxpupuli/tools-containerimages

.github/dependabot.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
25
version: 2
36
updates:
47
# raise PRs for gem updates

.github/labeler.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
25
skip-changelog:
36
- head-branch: ['^release-*']

.github/release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
25
# https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes
36

47
changelog:

.github/workflows/labeler.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
25
name: Labeler 🏷️
36

47
on:

.github/workflows/release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
25
name: Release 🚀
36

47
on:

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
14
.bundle/
25
.vendor/
36
vendor/

Gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# frozen_string_literal: true
22

3+
# Managed by modulesync - DO NOT EDIT
4+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
5+
36
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
47

58
group :release do

RELEASE.md

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,49 @@
1-
# How to make a release
1+
# Release
22

33
## On a fork
44

5-
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.
6-
7-
See Rakefile
8-
9-
```ruby
10-
config.future_release = `git rev-parse --abbrev-ref HEAD`.strip.split('-', 2).last
11-
```
12-
13-
Do the following:
5+
Please follow these instructions carefully.
6+
Ensure that you name the branch precisely as `release-vX.Y.Z`
7+
since this nomenclature is crucial for obtaining the `future_version` in the changelog.
8+
Your attention to this specific branch naming convention is essential for accurate version tracking in the changelog.
149

1510
```shell
1611
export RELEASE_VERSION="X.Y.Z"
1712
git switch main
1813
git pull -r
1914
git switch -c release-v$RELEASE_VERSION
20-
2115
bundle config set --local path vendor/bundle
22-
bundle config set --local with 'release'
2316
bundle install
24-
2517
CHANGELOG_GITHUB_TOKEN="token_MC_tokenface" bundle exec rake changelog
26-
2718
git commit -am "Release v${RELEASE_VERSION}"
2819
git push origin release-v$RELEASE_VERSION
2920
```
3021

22+
Then open a PR, discuss and merge.
23+
3124
## After the merge, as a maintainer on upstream
3225

3326
```shell
3427
git switch main
3528
git pull -r
36-
git tag v$RELEASE_VERSION -m "v$RELEASE_VERSION"
29+
git tag v$RELEASE_VERSION
3730
git push --tags
3831
```
32+
33+
## Tags
34+
35+
Each puppetserver and puppetdb is accompanied by a build_versions.json file
36+
containing information about puppet releases and versions built when a tag is pushed or a change is made to the main branch.
37+
38+
To enhance clarity and organization, we are transitioning from our previous tagging approach
39+
and will now distinguish the container tag from the puppet version.
40+
The new tags will follow the format vX.Y.Z. The CI build process operates within a matrix,
41+
leveraging the data from the JSON file to construct the specified versions.
42+
As a result, two Docker tags are currently generated: 7.13.0-vX.Y.Z corresponds to
43+
the Puppet Release 7.13.0 build with container version X.Y.Z, while 8.10.0-vX.Y.Z aligns
44+
with Release 8.10.0. These tags offer a more streamlined and informative representation of our build versions.
45+
46+
The container tags like `7.13.0-main` and `8.10.0-main` are built automatically
47+
whenever changes are merged into the Git main branch.
48+
It's important to note that these tags are designated as development tags
49+
and might be subject to breakage, so exercise caution when using them.

Rakefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# frozen_string_literal: true
22

3+
# Managed by modulesync - DO NOT EDIT
4+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
5+
36
begin
47
require 'rubygems'
58
require 'github_changelog_generator/task'

0 commit comments

Comments
 (0)