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

Update skaraMirror.sh to handle upstream jdk(head) version branching #55

Merged
merged 2 commits into from
Jun 15, 2024

Conversation

andrew-m-leonard
Copy link
Contributor

@andrew-m-leonard andrew-m-leonard commented Jun 14, 2024

Fixes adoptium/temurin-build#3841

Fixes the Adoptium mirror to handle upstream OpenJDK version branches.

  • Now the BRANCH environmental variable can be set to a non-master branch, eg.jdk23
  • This causes the mirror to mirror the upstream jdk23 branch to the same within the mirror, and also merge into dev and release branches called:
    • dev_$BRANCH
    • release_$BRANCH

The behaviour after this change, is not changed if BRANCH is not set or is value "master".

After this change is merged, the jdk(head) mirror Jenkins job shell script will be updated to the following:

export releaseTagExcludeList=""

branches="master jdk23"

for branch in $branches
do
  export BRANCH="$branch"
  bash ./skaraMirror.sh jdk
done

@andrew-m-leonard andrew-m-leonard self-assigned this Jun 14, 2024
@andrew-m-leonard
Copy link
Contributor Author

Tested on my mirror "fork", and test build of jdk-23 from it is successful.
Also, file compare with upstream repo successful.

README.md Outdated Show resolved Hide resolved
Co-authored-by: Martijn Verburg <[email protected]>
@karianna karianna merged commit c24d77c into adoptium:master Jun 15, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upstream openjdk/jdk(head) now branching releases rather than forking
3 participants