Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rework release preparation tasks #789

Merged
merged 1 commit into from
Feb 22, 2023
Merged

Rework release preparation tasks #789

merged 1 commit into from
Feb 22, 2023

Conversation

smortex
Copy link
Member

@smortex smortex commented Jul 27, 2022 •
edited
Loading

This is a follow-up to #788

Voxpupuli contributors used to update a module version and rake changelog before openning a PR for preparing a new release. Some modules now have a REFERENCE.md file that also needs to be updated (by running rake reference), and forgetting to do so will remained unnoticed until rake release complain that the file is not up-to-date (so after the release PR was reviewed and merged).

This PR remove the changelog and reference tasks which are now part of the voxpupuli-release gem.

@smortex smortex mentioned this pull request Jul 27, 2022
Closed
ekohl
ekohl requested changes Jul 28, 2022
View reviewed changes
Copy link
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The config_defaults.yml removal suggestions may become redundant when they are used again. That'll depend on the actual implementation we end up using.

config_defaults.yml Outdated Show resolved Hide resolved
moduleroot/Rakefile.erb Show resolved Hide resolved
moduleroot/Rakefile.erb Outdated Show resolved Hide resolved
@smortex smortex force-pushed the prepare-release-tasks branch from 6eb0ccd to 7cb7284 Compare August 10, 2022 00:53
@smortex smortex force-pushed the prepare-release-tasks branch from 7cb7284 to 53e535a Compare September 1, 2022 21:30
@smortex smortex requested review from ekohl and bastelfreak September 1, 2022 21:32
@bastelfreak
Copy link
Member

@ekohl @smortex can you take a look again? I think besides the merge commits it's ready to merge?

ekohl
ekohl reviewed Feb 15, 2023
View reviewed changes
moduleroot/Rakefile.erb Outdated Show resolved Hide resolved
moduleroot/Rakefile.erb Outdated Show resolved Hide resolved
@smortex smortex force-pushed the prepare-release-tasks branch 2 times, most recently from eeee714 to 1d09e30 Compare February 15, 2023 20:58
@smortex smortex mentioned this pull request Feb 15, 2023
Merged
ekohl
ekohl requested changes Feb 17, 2023
View reviewed changes
moduleroot/Rakefile.erb Outdated Show resolved Hide resolved
config_defaults.yml Outdated Show resolved Hide resolved
@smortex smortex requested a review from ekohl February 17, 2023 20:08
@smortex
Copy link
Member Author

smortex commented Feb 17, 2023

I just synced the modulesync_config repo form vox for one of our modules, with a change to target the development branch of voxpupuli-release:
https://github.com/opus-codium/puppet-odoo/pull/59/files#diff-d09ea66f8227784ff4393d88a19836f321c915ae10031d16c93d67e6283ab55fR24

The release which was previously broken is now fixed \o/:
https://github.com/opus-codium/puppet-odoo/actions/runs/4207161860

smortex added a commit to opus-codium/modulesync_config that referenced this pull request Feb 17, 2023
@smortex
Sync with Vox Pupuli
613de23 
In this branch we include what is required to validate this two PRs:

* voxpupuli/modulesync_config#789
  (Synced from this branch)
* voxpupuli/voxpupuli-release#44
  (Fetch the gem form the WIP branch in git rather than Rubygems)
@smortex smortex mentioned this pull request Feb 17, 2023
Merged
smortex added a commit to opus-codium/modulesync_config that referenced this pull request Feb 17, 2023
@smortex
Sync with Vox Pupuli
a7073c4 
In this branch we include what is required to validate this two PRs:

* voxpupuli/modulesync_config#789
  (Synced from this branch)
* voxpupuli/voxpupuli-release#44
  (Fetch the gem form the WIP branch in git rather than Rubygems)
smortex added a commit to opus-codium/modulesync_config that referenced this pull request Feb 17, 2023
@smortex
Sync with Vox Pupuli
a1de080 
In this branch we include what is required to validate this two PRs:

* voxpupuli/modulesync_config#789
  (Synced from this branch)
* voxpupuli/voxpupuli-release#44
  (Fetch the gem form the WIP branch in git rather than Rubygems)
ekohl
ekohl reviewed Feb 17, 2023
View reviewed changes
Copy link
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK provided the changes in voxpupuli-release are released and you bump the lower version bound in config_defaults.yml:

modulesync_config/config_defaults.yml

Lines 34 to 35 in 514efa7

- gem: voxpupuli-release
version: '>= 1.2.0'

@smortex smortex mentioned this pull request Feb 21, 2023
Merged
@smortex
Copy link
Member Author

smortex commented Feb 21, 2023

I just opened voxpupuli/voxpupuli-release#51. When merged, i will add a commit to this PR to bump the version requirement and we should be good to go 👍

@smortex
Copy link
Member Author

smortex commented Feb 22, 2023

ACK provided the changes in voxpupuli-release are released and you bump the lower version bound in config_defaults.yml:

modulesync_config/config_defaults.yml

Lines 34 to 35 in 514efa7

- gem: voxpupuli-release
version: '>= 1.2.0'

  • Done!

@smortex smortex requested a review from ekohl February 22, 2023 18:56
ekohl
ekohl reviewed Feb 22, 2023
View reviewed changes
config_defaults.yml Outdated Show resolved Hide resolved
config_defaults.yml
@@ -32,7 +32,7 @@ Gemfile:
ruby-version: '2.5'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not blocking for this, but I'm tempted to add the changelog generator as a hard dependency to voxpupuli-release.

config_defaults.yml Outdated Show resolved Hide resolved
@smortex smortex force-pushed the prepare-release-tasks branch from f2e71d3 to 72f3684 Compare February 22, 2023 20:26
ekohl
ekohl approved these changes Feb 22, 2023
View reviewed changes
Copy link
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's squash the commits.

Could you also open a PR to https://github.com/voxpupuli/puppet-example to verify the changes? Though I assume it's fine, it's better to know for sure.

@smortex
Rework release preparation tasks
0dd9814 
This is a follow-up to #788

Voxpupuli contributors used to update a module version and `rake
changelog` before openning a PR for preparing a new release.  Some
modules now have a REFERENCE.md file that also needs to be updated (by
running `rake reference`), and forgetting to do so will remained
unnoticed until `rake release` complain that the file is not up-to-date
(so after the release PR was reviewed and merged).

This PR remove the `changelog` and `reference` tasks which are now
part of the voxpupuli-release gem.
@smortex smortex force-pushed the prepare-release-tasks branch from 72f3684 to 0dd9814 Compare February 22, 2023 20:31
@smortex smortex mentioned this pull request Feb 22, 2023
Merged
smortex added a commit to opus-codium/modulesync_config that referenced this pull request Feb 22, 2023
@smortex
Sync with Vox Pupuli
28f34e5 
In this branch we include what is required to validate this two PRs:

* voxpupuli/modulesync_config#789
  (Synced from this branch)
* voxpupuli/voxpupuli-release#44
  (Fetch the gem form the WIP branch in git rather than Rubygems)
ekohl
ekohl approved these changes Feb 22, 2023
View reviewed changes
Copy link
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Pretty much the last step to minimizing the Rakefile. Just test_with_coveralls left. That should either be removed, moved to voxpupuli-test or puppetlabs_spec_helper. But that's for another PR.

@ekohl ekohl merged commit 9bef83f into master Feb 22, 2023
@ekohl ekohl deleted the prepare-release-tasks branch February 22, 2023 23:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bastelfreak bastelfreak bastelfreak approved these changes

@ekohl ekohl ekohl approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@smortex @bastelfreak @ekohl