Details
-
Type:
Improvement
-
Status: Closed (View Workflow)
-
Priority:
Major
-
Resolution: Done
-
Affects Version/s: None
-
Fix Version/s: None
-
Labels:None
-
Story Points:0.25
-
Epic Link:
-
Sprint:Spring 5
Description
Situation: We had previously been using main-JDK21 as our development branch while getting IGB to run on Java 21. During that process we split main-JDK21 into three three branches, including main-JDK21-with-javafx-no-theme which we used to cut the IGB 10.0.0 release and is our current development branch. In order to simplify the branch name, we discussed changing main-JDK21-with-javafx-no-theme to either "main" or "main-JDK21". As main-JDK21 is currently a branch with valuable commit history, but contains conflicts between itself and main-JDK21-with-javafx-no-theme, I propose to use "main" as the new development branch name. An alternative would be to rename the main-JDK21-with-javafx-no-theme branch to be main-JDK21 and rename the current main-JDK21 to something different in order to not lose its commit history.
Task: Create a new branch with the chosen name.
Attachments
Activity
| Field | Original Value | New Value |
|---|---|---|
| Epic Link | IGBF-1531 [ 17617 ] |
| Description |
Situation: We had previously been using main-JDK21 as our development branch while getting IGB to run on Java 21. During that process we split main-JDK21 into three three branches, including main-JDK21-with-javafx-no-theme which we used to cut the IGB 10.0.0 release and is our current development branch. In order to simplify the branch name, we discussed changing main-JDK21-with-javafx-no-theme to either "main" or "main-JDK21". As main-JDK21 is currently a branch with valuable commit history, but contains conflicts between itself and main-JDK21-with-javafx-no-theme, I propose to use "main" as the new development branch name.
Task: Create a new branch with the chosen name. |
Situation: We had previously been using main-JDK21 as our development branch while getting IGB to run on Java 21. During that process we split main-JDK21 into three three branches, including main-JDK21-with-javafx-no-theme which we used to cut the IGB 10.0.0 release and is our current development branch. In order to simplify the branch name, we discussed changing main-JDK21-with-javafx-no-theme to either "main" or "main-JDK21". As main-JDK21 is currently a branch with valuable commit history, but contains conflicts between itself and main-JDK21-with-javafx-no-theme, I propose to use "main" as the new development branch name. An alternative would be to rename the main-JDK21-with-javafx-no-theme branch to be main-JDK21 and rename the current main-JDK21 to something different in order to not lose its commit history.
Task: Create a new branch with the chosen name. |
| Status | To-Do [ 10305 ] | In Progress [ 3 ] |
| Status | In Progress [ 3 ] | Needs 1st Level Review [ 10005 ] |
| Status | Needs 1st Level Review [ 10005 ] | First Level Review in Progress [ 10301 ] |
| Status | First Level Review in Progress [ 10301 ] | Ready for Pull Request [ 10304 ] |
| Status | Ready for Pull Request [ 10304 ] | Pull Request Submitted [ 10101 ] |
| Status | Pull Request Submitted [ 10101 ] | Reviewing Pull Request [ 10303 ] |
| Status | Reviewing Pull Request [ 10303 ] | Merged Needs Testing [ 10002 ] |
| Status | Merged Needs Testing [ 10002 ] | Post-merge Testing In Progress [ 10003 ] |
Commit history looks good, pipeline ran successfully, default branch set to "main".
Closing ticket.
| Assignee | Ann Loraine [ aloraine ] |
| Resolution | Done [ 10000 ] | |
| Status | Post-merge Testing In Progress [ 10003 ] | Closed [ 6 ] |
Follow-up:
Updating bioviz-playbook's "igb" role to use "main" as the default early access branch instead of main-JDK21-with-javafx-no-theme.
A new branch main is made. I have configured the team repository so that branch "main" is now the default branch developers get when they clone IGB.