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.

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

Fixes 1042: Clarify release tagging #1073

Conversation

pljones
Copy link
Contributor

@pljones pljones commented Dec 18, 2024

Short description of changes
Clarify release tagging instructions.

Context: Fixes an issue? Related issues
Fixes: 1042

Status of this Pull Request
Another point raised whilst I was going through the 3.11.0 release (very minor).

What is missing until this pull request can be merged?
Review.

Does this need translation?
The doc has translation copies.

Checklist

  • I've verified that this Pull Request follows the general code principles
  • I waited some time after this Pull Request was opened and all GitHub checks completed without errors.
  • I'm sure that this Pull Request goes to the correct branch

@pljones pljones self-assigned this Dec 18, 2024
@pljones pljones requested review from softins and ann0see December 18, 2024 11:05
@pljones pljones added this to the Release 3.12.0 milestone Dec 18, 2024
@pljones pljones linked an issue Dec 18, 2024 that may be closed by this pull request
- [ ] Tag this commit as `r3_y_z`
- [ ] Wait for the build to complete
- [ ] [Tag the release version](https://jamulus.io/contribute/Release-Process#steps-for-a-specific-release):
- [ ] Update the version number in `Jamulus.pro` and add the release date to the Changelog header and commit.
Copy link
Member

Choose a reason for hiding this comment

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

I think updating Jamulus.pro and Changelog need to be done and committed before tagging, otherwise the release will not contain the proper version and change log?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The details seem duplicated in the referenced section.

Copy link
Member

@ann0see ann0see Dec 19, 2024

Choose a reason for hiding this comment

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

I'd prefer to have it here clearly as this avoids jumping. So roughly:

  1. Change Jamulus.pro and changelog version number
  2. Commit this and tag it as rx_y_z
  3. Add a new entry to the changelog and a update Jamulus.pro

Copy link
Contributor Author

@pljones pljones Dec 20, 2024

Choose a reason for hiding this comment

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

You mean everywhere we refer to steps-for-a-specific-release, copy the whole section in and get rid of that section, or what? If you don't do what that section says, you won't do it right.

Copy link
Member

@ann0see ann0see Dec 20, 2024

Choose a reason for hiding this comment

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

We should have the lowest friction as possible. So links are one step more. If we do link it, then also the "Update version number ..." stuff is unnecessary and we could just say "follow the release instructions on ..."

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There are two flows:

  • tagging and releasing any tagged release, be it dev, beta, rc or final release
  • the additional steps necessary only when tagging a final release

What I was trying to do was make that clearer.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Latest version: http://jamuluswebsite.drealm.info/contribute/Release-Process#steps-for-a-specific-release
This probably still needs further work, to be honest. It's referenced as "Tag the release version" here but covers mostly translations:

1. Ensure .ts files are up to date (...)

2. Notify all the translators that translation is required (...)

3. Update the .ts files returned by translators (...)

4. When all translations have been submitted and merged. (...) <-- This is where tagging starts

If this is a proper release, move the latest tag (...) (this intended to be a sub-step of 4, I think)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Maybe steps 1-3 should get split into "Translation Process" and step 4 and its sub-step should be "Release Tagging Process"?

Copy link
Contributor Author

@pljones pljones Dec 22, 2024

Choose a reason for hiding this comment

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

Also, the section on updating the ChangeLog would be better placed, in the overall Release Process page, between the section about translations and the section on performing the release -- it needs to happen before the final release and it never gets mentioned in the tagging section(s) (just repeatedly from here, in the places it needs to be).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I also notice this doc doesn't appear to reference the steps in Release Process about the translations.

Copy link
Member

@ann0see ann0see left a comment

Choose a reason for hiding this comment

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

I think it's ok (I've now seen that it's a subpoint...). Ideally, we'd have a release script/automation for the tagging procedure.

@pljones
Copy link
Contributor Author

pljones commented Dec 23, 2024

Locking Weblate, then merging outstandings before I do this.

@ann0see
Copy link
Member

ann0see commented Dec 23, 2024

Hmm. Yes. You're right. There was a webpage PR open on while I merged the other PR. 😐

@pljones pljones force-pushed the bugfix/release-process-release-tagging branch from 33582a2 to d607777 Compare December 23, 2024 20:19
@pljones pljones merged commit 26022c1 into jamulussoftware:next-release Dec 23, 2024
1 check failed
@pljones pljones deleted the bugfix/release-process-release-tagging branch December 23, 2024 20:20
@pljones
Copy link
Contributor Author

pljones commented Dec 23, 2024

Weblate merged, updated weblate, rebased this, merged this, updated weblate again (probably didn't need the first one...), unlocked weblate.

Hopefully that'll keep weblate calm...

@pljones
Copy link
Contributor Author

pljones commented Dec 23, 2024

I've raised #1076 for my other comments.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Differences in tagging a release are confusing
3 participants