-
-
Notifications
You must be signed in to change notification settings - Fork 12
Creating an ".1" release branch for upstream "update re‐spins"
This Adoptium mirrors upstream Skara openjdk repos directly to the "master" branch on this mirror.
The "dev" branch is the merge of the lastest upstream HEAD, merged with the "Adoptium patches".
The "release" branch is the merge of the upstream "build tags" in chronological order, merged with the "Adoptium patches", and then tagged with "jdk-a.b.c+d_adopt".
Adoptium Release builds build from these "_adopt" tags, ie.the latest upstream build tag merged with "Adoptium patches".
Problem: When a subsequent non-chronological upstream ".1" "update re-spin" occurs, no _adopt tag for this is created, as it is not chronoglically created from the upstream HEAD, but from the GA tag that is being "updated/re-spinned".
To resolve this we need to create a new Adoptium mirror "release_" branch, which is a branch from the original GA _adopt tag with the upstream re-spin tag merged into it, and then subequently tagged with a new _adopt tag.
Note: To perform these changes you will require "write" access to the Adoptium mirror to push the new branch.
Example: Say jdk-17.0.8-ga is being "updated and re-spinned" as a new release jdk-17.0.8.1-ga
Determine the jdk-17.0.8-ga "_adopt" build tag, ie. jdk-17.0.8+7_adopt
Determine the re-spin jdk-17.0.8.1-ga build tag, ie. jdk-17.0.8.1+1
git clone git@github.com:adoptium/jdk17u.git
cd jdk17u
git checkout -b release_jdk17.0.8.1 jdk-17.0.8+7_adopt
git merge -m"Merging jdk-17.0.8.1+1 into release_jdk17.0.8.1" jdk-17.0.8.1+1
git tag -a "jdk-17.0.8.1+1_adopt" -m "Merged jdk-17.0.8.1+1 into release_jdk17.0.8.1"
git push --tags origin release_jdk17.0.8.1