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

Minor wording tweaks #149

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Minor wording tweaks #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/main/java/io/quarkus/bot/release/ReleaseInformation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,15 @@ public String getBranch() {
return branch;
}

@JsonIgnore
public String getFullBranch() {
if (Branches.isLts(branch)) {
return branch + " LTS";
}

return branch;
}

public String getOriginBranch() {
return originBranch;
}
Expand Down
12 changes: 7 additions & 5 deletions src/main/java/io/quarkus/bot/release/step/CreateBranch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,10 @@ public int run(Context context, Commands commands, GitHub quarkusBotGitHub, Rele

String comment = ":white_check_mark: Branch " + releaseInformation.getBranch()
+ " has been created and the milestone and backport labels adjusted.\n\n";
comment += "We created a new `" + nextMinorInMain + " - main`"
+ " milestone for future developments.\n\n";
if (releaseInformation.isOriginBranchMain()) {
comment += "We created a new `" + nextMinorInMain + " - main`"
+ " milestone for future developments.\n\n";
}
comment += "Make sure to [adjust the name of the milestone](https://github.com/quarkusio/quarkus/milestones) if needed as the name has simply been inferred from the current release.\n\n";
comment += Admonitions.important("Please announce that we branched " + releaseInformation.getBranch()
+ " by sending an email to [[email protected]](mailto:[email protected]) and posting on [Zulip #dev stream](https://quarkusio.zulipchat.com/#narrow/stream/187038-dev/):\n\n"
Expand Down Expand Up @@ -254,13 +256,13 @@ private static String getBranchEmail(ReleaseInformation releaseInformation, Stri
boolean isNextMinorLts, String nextMinorInMain) {
String email = "Subject:\n"
+ "```\n"
+ "Quarkus " + releaseInformation.getBranch() + " branched\n"
+ "Quarkus " + releaseInformation.getFullBranch() + " branched\n"
+ "```\n"
+ "Body:\n"
+ "```\n"
+ "Hi,\n"
+ "\n"
+ "We just branched " + releaseInformation.getBranch() + ". The main branch is now "
+ "We just branched " + releaseInformation.getFullBranch() + ". The main branch is now "
+ (nextMinorInMain != null ? nextMinorInMain : "**X.Y**");

if (isNextMinorLts && nextMinor != null) {
Expand All @@ -271,7 +273,7 @@ private static String getBranchEmail(ReleaseInformation releaseInformation, Stri
+ "\n"
+ "Please make sure you add the appropriate backport labels from now on:\n"
+ "\n"
+ "- for anything required in " + releaseInformation.getBranch() + " (currently open pull requests included), please add the " + Labels.BACKPORT_LABEL + " label\n";
+ "- for anything required in " + releaseInformation.getFullBranch() + " (currently open pull requests included), please add the " + Labels.BACKPORT_LABEL + " label\n";

email += "- for fixes we also want in future " + previousMinorBranch + ", please add the " + Labels.backportForVersion(previousMinorBranch) + " label\n";

Expand Down