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.

Sign up for GitHub

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

create_installer_windows failing with new "temurin" variant support #438

Merged
merged 1 commit into from
Feb 17, 2022
Merged

create_installer_windows failing with new "temurin" variant support #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkgbuild/create-installer-mac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ do tar -xf "$f";
*openj9*)
export JVM="openj9"
;;
*)
echo Cannot identify variant from filename "${f}" - only hotspot or openj9 are allowable
exit 1
;;
esac

# Detect if JRE or JDK
Expand Down
4 changes: 4 additions & 0 deletions wix/Build.OpenJDK_generic.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ IF NOT "%ARCH%" == "x64" (
)
)

REM Update to handle the change of build variant until implications
REM of setting this to Temurin can be evaluated
IF "%JVM%" == "temurin" SET JVM=hotspot
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sxa, @karianna Why this special case is not handled on the caller side ?
temurin is not a JVM so the JVM arg must not accept "temurin" and hide some other value behind ..

If you set upsteam a vendor name temurin , his place is in VENDOR_BRANDING from this script, not in JVM arg

I think in caller job you must do somthing like that:
if (VARIANT == "temurin" )
VENDOR_BRANDING"=Temurin"
JVM="hotspot" // default JVM for VARIANT "temurin"
call createInstallerJob
fi

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The intention of the initial set of changes was to do the minimum required in the pipelines to enable the use of a temurin variant. There will likely be subsequent changes to split this out using other variables but initially this was the simplest option to prove that we could split out hotspot and temurin. After implementing it, we hit this issue and this was the simplest way to fix it which wouldn't involve any risk to changing the contents of the package.

I agree this could be switched to being done in the calling pipelines, and so your proposed change can be covered in the other issue which Martijn has created :-)


IF NOT "%JVM%" == "hotspot" (
IF NOT "%JVM%" == "openj9" (
IF NOT "%JVM%" == "dragonwell" (
Expand Down