Repository navigation
Skip generating checksum files for SBOM artifacts in Solaris build - #4334
Conversation
|
Thank you for creating a pull request! |
|
@andrew-m-leonard and @sxa Please review this clean PR. |
andrew-m-leonard
left a comment
There was a problem hiding this comment.
Looks good thanks
|
Looking at a test run of this and it's possible that the Solaris build is currently broken although it's in the freetype section so may have been a result of #4320 making it go down a part which it didn't do before: |
I hit it too. I think this ws the reason, why solaris needed one special version of external freetype. Was 50to50 "sure", that when moved to intree freetype the issue will disappear, because it was coming from different, external version then the original "perfect one". I can not find full trace after the merges of #4306 (comment). Do you have one handy?
Error: File:[/github/workspace/sbin/solaris/build-simple.sh] is not executable @SehrishHussain Please fix this last linter issue! Chmod it please. 755 I guess... |
AS it is from yesterday, then it seems I was still pulling in tree 2.9,but today it should be already pulling usptream's 2.13. Worthy to rerun. If it will still be pulling some freetype, then I overlooked some external switch. |
|
Solaris issue should be fixed by #4342 so we can aim to get that one in, rebase this PR on top of it, and then run the test again. |
|
lint items like: In /github/workspace/sbin/solaris/build-simple.sh line 53: |
|
@judovana Hmmm it's not linking properly on Solaris :'( Looks like it's not correctly pulling in the C libraries when linking the built freetype: I'm tempted to suggest we just leave freetype using the original mechanism for now if this is going to be problematic and can't be fixed without an upstream patch. |
Wou. @sxa ; How that is possible? soemthing like Should do the job then (not tested) |
c2bf4b0 to
0a003d2
Compare
|
I had a quick try and patching in I'm testing with |
Needed some extra parameters on our machines which I've added into https://github.com/adoptium/temurin-build/pull/4345/changes - @SehrishHussain I'll let you decide if you want me to push that forward and then you rebase on it, or you can just make those same changes to |
|
Looks like #4304 has introduced several constructs which break the Solaris build due to the use of non-standard UNIX command parameters :-( |
|
Hey @sxa , |
Yep - please go ahead with those changes :-) |
0a003d2 to
e3c0d03
Compare
|
@sxa Can you confirm the changes. |
|
We'll need the changes from #4345 in - I've tagged @andrew-m-leonard so hopefully he can approve and so you can rebase on those changes. If not, you can just make those changes in your PR so I can test it properly - it doesn't get as far as trying to create the SBoM without those other changes unfortunately. |
@SehrishHussain I've approved and merged #4345 so you can rebase your PR now |
e3c0d03 to
166e51d
Compare
|
@andrew-m-leonard Thank you! I’ve rebased this PR onto the latest main now that #4345 is merged. |
|
https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/sxa-sehrish-solaris/15/console seemed to have left the sha256.txt files around. I'll see if I can check if I've missed anything with that job on Monday :-) |
|
Noting that the "Skip SBOM" change went in under PR4330 and this PR now removes those changes and adds an Build 15 here was with the current changes in this PR (so it looks like the Looks like the pattern is incorrect as the |
|
@sxa Thank you for your patience with my work. I'm wondering is it possible that the SBOM checksum may already be generated upstream (e.g. during temurin-build, SBOM tooling, or in Thank you for pointing out the SBOM file name conventions, i.e. |
I expect so yeah |
166e51d to
4f6afcb
Compare
|
@sxa can you check if the code is doing intended job! |
The testing is taking a lot longer at the moment as it's being incredibly slow to copy the resulting builds off the Solaris machine (When I say incredibly slow it's been running for about ten hours when it should complete in about one, but isn't far away now!) |
|
I'm pretty sure the code is ok now, but I'll try one final test before merging. |
|
@sxa Yes please to be on safe side run one more test. Appreciate your patience! |
|
Looks good now! |
sxa
left a comment
There was a problem hiding this comment.
Tested and seems to be working well so I'll merge this - thanks @SehrishHussain for getting these fixes in!
|
@sxa the purpose of grouping echo statement into a single |
Update Solaris build-simple.sh to handle SBOM checksums
This PR updates the Solaris
build-simple.shscript to correctly handle SHA256 checksums for SBOM JSON artifacts. Previously, SBOM files either skipped checksums entirely or left temporary.sha256.txtfiles behind.Closes #4316
Changes
for FILE in OpenJDK*loop now:.sha256.txtimmediately after.<name>-metadata.jsonconvention.Local Testing
OpenJDK-fake.tar.gzandOpenJDK-fake.sbom.json..sha256.txtas expected..sha256.txtremains.This ensures Solaris builds behave consistently with other platforms and prevents unnecessary SBOM checksum files from being generated.