Version numbers conf parsing script by adamfarley · Pull Request #4304 · adoptium/temurin-build

adamfarley · 2025-11-13T14:26:23Z

This ensures that we're using the OpenJDK version string as defined in the version_numbers.conf file rather than the git tag (if the two are different).

We do this because conflicts have caused problems in the past, where we tell (e.g.) an installer creation job that various dependencies are in the folder for version 1, even though the folders are named after version 2 in version_numbers.conf.

Resolves #4302

Signed-off-by: Adam Farley <adfarley@ibm.com>

This version is far more conservative so as to minimise risk of disruption to the builds. Signed-off-by: Adam Farley <adfarley@ibm.com>

Signed-off-by: Adam Farley <adfarley@ibm.com>

adamfarley · 2025-11-14T16:37:30Z

Test run on jdk25u, where we see the issue we're trying to solve.

https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk25u/job/jdk25u-windows-x64-temurin/13/

Update: Specifying a default build number of 0 causes problems (detailed below), so I'm changing it to "1" and rerunning.

https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk25u/job/jdk25u-windows-x64-temurin/14/

When we specify a build number of 0, the openjdk build scripts interpret that as there being no build number at all.

This means that the vendor string and folder names use build number "0", while everything else uses an empty string.

So we end up having the same problem. The installer jobs are passed a build number of "null", while the folder names are using "+0". Installer job creation fails.

So I changed it to "1" to avoid that logic path.

Update 2: Test passed completely. Ready for review.

Signed-off-by: Adam Farley <adfarley@ibm.com>

karianna · 2025-11-18T20:52:18Z

General comment, how does the git tag get out of sync with that conf file? Should one or the other not be corrected?

adamfarley · 2025-11-25T09:25:08Z

@adamfarley there's an erroneous '}'

Ah yes. I removed an elif by accident. All sorted.

Linter still has concerns though. Fixing them now.

Signed-off-by: Adam Farley <adfarley@ibm.com>

adamfarley · 2025-11-26T11:34:23Z

And here's a jenkins helper tweak to accommodate build number 0 (so VersionInfo doesn't return a null).

adoptium/jenkins-helper#63

Testing here:

https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk25u/job/jdk25u-windows-x64-temurin/18/

It passed the relevant stages, but failed SBOM validation.

I've written a fix and tested it here: https://ci.adoptium.net/job/sbom_validator_job/272 - passed.

Signed-off-by: Adam Farley <adfarley@ibm.com>

adamfarley · 2025-11-28T15:41:52Z

Here is the PR for passing an empty string into the sbom validator when scm is not set.

adoptium/ci-jenkins-pipelines#1330

Signed-off-by: Adam Farley <adfarley@ibm.com>

adamfarley · 2025-12-02T09:34:19Z

Merged. Thanks for the reviews and your help refining this code.
@sxa @andrew-m-leonard @karianna 😎

adamfarley · 2025-12-02T10:44:34Z

On request, here's an additional test run against a repo without any tags:

https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk25u/job/jdk25u-windows-x64-temurin/35

Update: It passed correctly. We received two warnings:

The first said there were no tags, so we'd use the default tag of 25.0.0
The second said that 25.0.0 didn't match the source, so we override the default with 25.0.3

* First draft of version numbers conf parsing script Signed-off-by: Adam Farley <adfarley@ibm.com> * Second draft of the jdk version file parser This version is far more conservative so as to minimise risk of disruption to the builds. Signed-off-by: Adam Farley <adfarley@ibm.com> * Linter fixes and improvements Signed-off-by: Adam Farley <adfarley@ibm.com> * Checking for unbound SCM_REF Signed-off-by: Adam Farley <adfarley@ibm.com> * Redelimiting unbound variable Signed-off-by: Adam Farley <adfarley@ibm.com> * Making a zero-length check shorter Signed-off-by: Adam Farley <adfarley@ibm.com> * Amending null check to include indexing errors Signed-off-by: Adam Farley <adfarley@ibm.com> * Changing bash delimiters to disable index expansion Signed-off-by: Adam Farley <adfarley@ibm.com> * Trialling removal of a flaky if condition Signed-off-by: Adam Farley <adfarley@ibm.com> * Adding quotes for string Signed-off-by: Adam Farley <adfarley@ibm.com> * Fix for version string parser in build.sh Signed-off-by: Adam Farley <adfarley@ibm.com> * Refactoring unbound variable handling Signed-off-by: Adam Farley <adfarley@ibm.com> * Removing superfluous dollar sign Signed-off-by: Adam Farley <adfarley@ibm.com> * Switching to -v for cross-compatibility Signed-off-by: Adam Farley <adfarley@ibm.com> * Switching to -z again Signed-off-by: Adam Farley <adfarley@ibm.com> * Switching to -v Signed-off-by: Adam Farley <adfarley@ibm.com> * Another try Signed-off-by: Adam Farley <adfarley@ibm.com> * Trying a for loop Signed-off-by: Adam Farley <adfarley@ibm.com> * Adding formatting whitespace Signed-off-by: Adam Farley <adfarley@ibm.com> * Changing default build number to 1 in version string Signed-off-by: Adam Farley <adfarley@ibm.com> * Handling an incorrect number of arguments Signed-off-by: Adam Farley <adfarley@ibm.com> * Updating arg validation logic and comments Signed-off-by: Adam Farley <adfarley@ibm.com> * Switching build_src to camel case Signed-off-by: Adam Farley <adfarley@ibm.com> * Updated comments Signed-off-by: Adam Farley <adfarley@ibm.com> * Removing duplicate error reporting logic Signed-off-by: Adam Farley <adfarley@ibm.com> * Extra comments and restructuring for readability Signed-off-by: Adam Farley <adfarley@ibm.com> * Extra comments for clarity Signed-off-by: Adam Farley <adfarley@ibm.com> * Useful comment Signed-off-by: Adam Farley <adfarley@ibm.com> * Extracting file parsing logic from compareToOpenJDKFileVersion Signed-off-by: Adam Farley <adfarley@ibm.com> * Removing unused variable Signed-off-by: Adam Farley <adfarley@ibm.com> * Switching to -n to avoid scm_ref unbound variable issue Signed-off-by: Adam Farley <adfarley@ibm.com> * Switching version file parser gate to TAG for better locality Signed-off-by: Adam Farley <adfarley@ibm.com> * Updating jdk version comparison logic for brevity and clarity Signed-off-by: Adam Farley <adfarley@ibm.com> * Changing if to elif to prevent multiple matches Signed-off-by: Adam Farley <adfarley@ibm.com> * Quoting grep output to prevent splitting Signed-off-by: Adam Farley <adfarley@ibm.com> * Adding warning message for jdk version override Signed-off-by: Adam Farley <adfarley@ibm.com> * Removing excess whitespace Signed-off-by: Adam Farley <adfarley@ibm.com> * Updating SBOM validator to better handle false negatives Signed-off-by: Adam Farley <adfarley@ibm.com> * Restructuring SHA check in SBOM validation Signed-off-by: Adam Farley <adfarley@ibm.com> * Improving posix compliance of SBOM validation Signed-off-by: Adam Farley <adfarley@ibm.com> * Changing script to use empty strings instead of nulls Signed-off-by: Adam Farley <adfarley@ibm.com> * Amending curl command for efficiency Signed-off-by: Adam Farley <adfarley@ibm.com> * Allow for empty scm parameter Signed-off-by: Adam Farley <adfarley@ibm.com> * Removing unnecessary code Signed-off-by: Adam Farley <adfarley@ibm.com> * Make code shorter and easier to read Signed-off-by: Adam Farley <adfarley@ibm.com> * Making code more concise and easier to maintain Signed-off-by: Adam Farley <adfarley@ibm.com> --------- Signed-off-by: Adam Farley <adfarley@ibm.com>

First draft of version numbers conf parsing script

9df7d9f

Signed-off-by: Adam Farley <adfarley@ibm.com>

adamfarley self-assigned this Nov 13, 2025

github-actions Bot added the installer Issues that relate to our installer jobs or installer repo label Nov 13, 2025

karianna marked this pull request as draft November 13, 2025 19:35

adamfarley added 18 commits November 14, 2025 11:15

Second draft of the jdk version file parser

48c7569

This version is far more conservative so as to minimise risk of disruption to the builds. Signed-off-by: Adam Farley <adfarley@ibm.com>

Linter fixes and improvements

1f2c2c2

Signed-off-by: Adam Farley <adfarley@ibm.com>

Checking for unbound SCM_REF

96f7934

Signed-off-by: Adam Farley <adfarley@ibm.com>

Redelimiting unbound variable

6363d56

Signed-off-by: Adam Farley <adfarley@ibm.com>

Making a zero-length check shorter

edbe859

Signed-off-by: Adam Farley <adfarley@ibm.com>

Amending null check to include indexing errors

4b0bbdf

Signed-off-by: Adam Farley <adfarley@ibm.com>

Changing bash delimiters to disable index expansion

504ebfc

Signed-off-by: Adam Farley <adfarley@ibm.com>

Trialling removal of a flaky if condition

6c3ee4d

Signed-off-by: Adam Farley <adfarley@ibm.com>

Adding quotes for string

e02aff0

Signed-off-by: Adam Farley <adfarley@ibm.com>

Fix for version string parser in build.sh

999da11

Signed-off-by: Adam Farley <adfarley@ibm.com>

Refactoring unbound variable handling

052c1c9

Signed-off-by: Adam Farley <adfarley@ibm.com>

Removing superfluous dollar sign

be5c5d8

Signed-off-by: Adam Farley <adfarley@ibm.com>

Switching to -v for cross-compatibility

b42b7d0

Signed-off-by: Adam Farley <adfarley@ibm.com>

Switching to -z again

35e37af

Signed-off-by: Adam Farley <adfarley@ibm.com>

Switching to -v

84e3595

Signed-off-by: Adam Farley <adfarley@ibm.com>

Another try

63c498e

Signed-off-by: Adam Farley <adfarley@ibm.com>

Trying a for loop

90bdb95

Signed-off-by: Adam Farley <adfarley@ibm.com>

Adding formatting whitespace

477ed20

Signed-off-by: Adam Farley <adfarley@ibm.com>

adamfarley mentioned this pull request Nov 17, 2025

Build Issue Summary for 2025-11-17 #4305

Closed

Changing default build number to 1 in version string

ef71522

Signed-off-by: Adam Farley <adfarley@ibm.com>

adamfarley changed the title ~~WIP: Version numbers conf parsing script~~ Version numbers conf parsing script Nov 18, 2025

adamfarley marked this pull request as ready for review November 18, 2025 16:59

adamfarley requested review from andrew-m-leonard and karianna November 18, 2025 17:02

Quoting grep output to prevent splitting

fa8d07d

Signed-off-by: Adam Farley <adfarley@ibm.com>

karianna approved these changes Nov 26, 2025

View reviewed changes

andrew-m-leonard reviewed Nov 26, 2025

View reviewed changes

Comment thread sbin/build.sh Outdated

adamfarley added 2 commits November 26, 2025 11:26

Adding warning message for jdk version override

5170978

Signed-off-by: Adam Farley <adfarley@ibm.com>

Removing excess whitespace

ec7befb

Signed-off-by: Adam Farley <adfarley@ibm.com>

adamfarley mentioned this pull request Nov 26, 2025

Closing coding hole where exception can result in a null build number adoptium/jenkins-helper#63

Merged

adamfarley added 3 commits November 28, 2025 13:13

Updating SBOM validator to better handle false negatives

c9b4270

Signed-off-by: Adam Farley <adfarley@ibm.com>

Restructuring SHA check in SBOM validation

b05c6b6

Signed-off-by: Adam Farley <adfarley@ibm.com>

Improving posix compliance of SBOM validation

952e150

Signed-off-by: Adam Farley <adfarley@ibm.com>

andrew-m-leonard reviewed Nov 28, 2025

View reviewed changes

Comment thread tooling/validateSBOMcontent.sh Outdated

Changing script to use empty strings instead of nulls

f7301ae

Signed-off-by: Adam Farley <adfarley@ibm.com>

andrew-m-leonard reviewed Nov 28, 2025

View reviewed changes

Comment thread tooling/validateSBOMcontent.sh Outdated

adamfarley added 2 commits November 28, 2025 14:56

Amending curl command for efficiency

78649bd

Signed-off-by: Adam Farley <adfarley@ibm.com>

Allow for empty scm parameter

8cc290a

Signed-off-by: Adam Farley <adfarley@ibm.com>

Removing unnecessary code

b7fe79f

Signed-off-by: Adam Farley <adfarley@ibm.com>

andrew-m-leonard approved these changes Nov 28, 2025

View reviewed changes

sxa reviewed Nov 28, 2025

View reviewed changes

Comment thread sbin/build.sh Outdated

sxa reviewed Nov 28, 2025

View reviewed changes

Comment thread sbin/build.sh Outdated

adamfarley added 2 commits December 1, 2025 09:50

Make code shorter and easier to read

c6021b5

Signed-off-by: Adam Farley <adfarley@ibm.com>

Making code more concise and easier to maintain

3e45ed8

Signed-off-by: Adam Farley <adfarley@ibm.com>

adamfarley merged commit 5584d0f into adoptium:master Dec 2, 2025
29 checks passed

This was referenced Dec 22, 2025

Skip generating checksum files for SBOM artifacts in Solaris build #4334

Merged

switch version parsing to use standard commands #4347

Merged

andrew-m-leonard mentioned this pull request Feb 20, 2026

JDK 25 EA API request doesn't return latest build adoptium/api.adoptium.net#1828

Closed

Navigation Menu

Repository navigation

Version numbers conf parsing script - #4304

Version numbers conf parsing script#4304
adamfarley merged 48 commits into
adoptium:masterfrom
adamfarley:generate_tag_from_version_numbers_conf

adamfarley commented Nov 13, 2025

Uh oh!

adamfarley commented Nov 14, 2025 •

edited

Loading

Uh oh!

karianna commented Nov 18, 2025

Uh oh!

adamfarley commented Nov 25, 2025 •

edited

Loading

Uh oh!

Uh oh!

adamfarley commented Nov 26, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

adamfarley commented Nov 28, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

adamfarley commented Dec 2, 2025

Uh oh!

adamfarley commented Dec 2, 2025 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

adamfarley commented Nov 13, 2025

Uh oh!

adamfarley commented Nov 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

karianna commented Nov 18, 2025

Uh oh!

adamfarley commented Nov 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

adamfarley commented Nov 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

adamfarley commented Nov 28, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

adamfarley commented Dec 2, 2025

Uh oh!

adamfarley commented Dec 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

adamfarley commented Nov 14, 2025 •

edited

Loading

adamfarley commented Nov 25, 2025 •

edited

Loading

adamfarley commented Nov 26, 2025 •

edited

Loading

adamfarley commented Dec 2, 2025 •

edited

Loading