<div dir="ltr"><div dir="ltr"><br></div><div dir="ltr">> -- Not sure if I understand your requirements correctly. Are these tags here <a href="https://github.com/openjdk/riscv-port-jdk11u/tags" rel="noreferrer" target="_blank">https://github.com/openjdk/riscv-port-jdk11u/tags</a> you are looking for?<br>> This should be the same as the tags of jdk11u-dev upstream (<a href="https://github.com/openjdk/jdk11u-dev/tags" rel="noreferrer" target="_blank">https://github.com/openjdk/jdk11u-dev/tags</a>)</div><div dir="ltr"><br></div><div>That is correct and exactly describes the problem. They are pointing at the same commits as upstream so they cannot be used to build on riscv64 as they do not include the riscv64 commits from the riscv-port branch. We are looking for an equivalent tag that we can reference in our CI which equates to the current tag but including the riscv64 patches which make that tag build on the platform (which is what is done in <a href="https://github.com/openjdk/aarch32-port-jdk8u/tags" target="_blank">https://github.com/openjdk/aarch32-port-jdk8u/tags</a> for example) or to have the existing tags in that repository overwritten by an equivalent tag that includes the commits for riscv64 support (that option would make our automation easier but there are reasons to choose both approaches).</div><div><br></div><div>To see the problem in action you can look at the logs of the jobs in our CI at <a href="https://ci.adoptium.net/job/build-scripts/job/jobs/job/evaluation/job/jobs/job/jdk11u/job/jdk11u-evaluation-linux-riscv64-temurin/" target="_blank">https://ci.adoptium.net/job/build-scripts/job/jobs/job/evaluation/job/jobs/job/jdk11u/job/jdk11u-evaluation-linux-riscv64-temurin/</a> - a similar set of jobs are initiated by us across all platforms when a new jdk-11.0.x+y tag appears on the main jdk11u repository, and then the builds on each platform (such as the one in that link) are kicked off to build that specific tag. This does not work for riscv64 at present so all of those jobs fail (#40 on there is an exception as it was manually triggered without a tag being passed in so built successfully as it came from the HEAD of the default riscv-port branch). Our goal here is to have a way to perform a riscv64 build of something equivalent to the upstream tags. Hopefully that explains the requirement. Let us know if there are any further questions on this.<br></div><div dir="ltr"><br clear="all"><div><div dir="ltr" class="gmail_signature"><div dir="ltr"><div>Regards,</div><div><br></div><div>Stewart...</div><div>--</div><div>Working for <a href="https://www.redhat.com" target="_blank">Red Hat</a> on <a href="https://adoptium.net" target="_blank">Adoptium Temurin</a> and <a href="http://nodejs.org" target="_blank">Node.js<br></a><div><a href="https://fosstodon.org/@sxa" target="_blank">https://fosstodon.org/@sxa</a></div></div><a href="https://github.com/sxa" target="_blank">https://github.com/sxa</a><br><div><br></div></div></div></div><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, 19 Aug 2024 at 15:50, <<a href="mailto:yangfei@iscas.ac.cn" target="_blank">yangfei@iscas.ac.cn</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Hello,<br>
<br>
-----Original Messages-----<br>
From:"Ludovic Henry" <<a href="mailto:ludovic@rivosinc.com" target="_blank">ludovic@rivosinc.com</a>><br>
Sent Time:2024-08-16 21:35:37 (Friday)<br>
To: riscv-port-dev <<a href="mailto:riscv-port-dev@openjdk.org" target="_blank">riscv-port-dev@openjdk.org</a>>, <a href="mailto:fyang@openjdk.org" target="_blank">fyang@openjdk.org</a><br>
Cc: "Stewart Addison" <<a href="mailto:sxa@redhat.com" target="_blank">sxa@redhat.com</a>><br>
Subject: JDK11u repository and tagging<br>
<br>
Hi, <br>
<br>
As we are trying to have testing and releasing of riscv-port-jdk11u at Adoptium, we are running into the issue that the way we are tagging this repo is inconsistent with jdk11u-dev (see adoptium/temurin-build#3911 for more details) For example, the latest merge from `jdk11u-dev:master` into `riscv-port-jdk11u:riscv-port` with eff8723 merges jdk-11.0.25+2 but no equivalent tag is created on eff8723. <br>
<br>
-- Not sure if I understand your requirements correctly. Are these tags here <a href="https://github.com/openjdk/riscv-port-jdk11u/tags" rel="noreferrer" target="_blank">https://github.com/openjdk/riscv-port-jdk11u/tags</a> you are looking for?<br>
This should be the same as the tags of jdk11u-dev upstream (<a href="https://github.com/openjdk/jdk11u-dev/tags" rel="noreferrer" target="_blank">https://github.com/openjdk/jdk11u-dev/tags</a>)<br>
<br>
Taking aarch32-port-jdk8u as an example, the solution has been to tag the merge of the jdk8u-dev tag with an equivalent name. For example, the merge commit of `jdk8u422-ga` is tagged with `jdk8u422-ga-aarch32-20240725`. <br>
<br>
Fei, I understand you've been doing it. Has it been a manual process for you? Are you looking at automating some of the merging process? <br>
<br>
-- I have been doing merge of jdk11u-dev upstream into this repo irregularly, which is done manually. There isn't such an automating of the merging process for now. <br>
Do you have any suggesion from your side when doing releases? Or shall I delegate this merging work to you guys?<br>
<br>
Regards,<br>
- Fei Yang<br>
<br>
<br>
<br>
</<a href="mailto:sxa@redhat.com" target="_blank">sxa@redhat.com</a>></<a href="mailto:riscv-port-dev@openjdk.org" target="_blank">riscv-port-dev@openjdk.org</a>></<a href="mailto:ludovic@rivosinc.com" target="_blank">ludovic@rivosinc.com</a>></blockquote></div></div>