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

create_installer_windows failing with new "temurin" variant support #438

Merged
merged 1 commit into from
Feb 17, 2022

Conversation

sxa
Copy link
Member

@sxa sxa commented Feb 17, 2022

Fix for the following error in create_installer_windows:

JVM "temurin" not supported : valid values : hotspot, openj9, dragonwell, hotspot openj9, openj9 hotspot

This just maps JVM=temurin to JVM=hotspot to ensure all the values are the same as before. Happy to entertain a discussion on whether this should be changed in the future but for now this should allow the installer to be generated the same as it was before the changes.
Signed-off-by: Stewart X Addison sxa@redhat.com

@sxa sxa changed the title mac: Trap case where nether hotspot or openj9 are in the filename (#437) create_installer_windows failing with new "temurin" variant support Feb 17, 2022
@sxa sxa self-assigned this Feb 17, 2022
@sxa
Copy link
Member Author

sxa commented Feb 17, 2022

@gdams Any idea what's going on with the checks here? Is http://s.sudre.free.fr/ a legitimate source (if nothing else it seems a bit wrong that it's not https)

Run brew install --cask packages
  brew install --cask packages
  shell: /bin/bash -e {0}
==> Downloading http://s.sudre.free.fr/Software/files/Packages.dmg
Warning: No checksum defined for cask 'packages', skipping verification.
Warning: macOS's Gatekeeper has been disabled for this Cask
==> Installing Cask packages
==> Purging files for version 1.2.10 of Cask packages
Error: Failure while executing; `hdiutil convert -quiet -format UDTO -o /private/tmp/d20220217-812-3r9z2s/02a5de38825fc3ddbe60b7fa49ca849cab656a74b8b0fb64158ea39f1a2bcff9--Packages.cdr /Users/runner/Library/Caches/Homebrew/downloads/02a5de38825fc3ddbe60b7fa49ca849cab656a74b8b0fb64158ea39f1a2bcff9--Packages.dmg` exited with 1.
Error: Process completed with exit code 1.

@gdams
Copy link
Member

gdams commented Feb 17, 2022

@sxa I'm not entirely sure what's broken, the cask was updated 10 days ago (https://github.com/Homebrew/homebrew-cask/blob/master/Casks/packages.rb) so I wonder if the link is broken, I'll try running it again

@sxa
Copy link
Member Author

sxa commented Feb 17, 2022

@sxa I'm not entirely sure what's broken, the cask was updated 10 days ago (https://github.com/Homebrew/homebrew-cask/blob/master/Casks/packages.rb) so I wonder if the link is broken, I'll try running it again

Hmm seems ok this time. Hopefully x64 will go through ok too ...
[EDIT: It has]

Copy link
Contributor

@karianna karianna left a comment

Choose a reason for hiding this comment

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

lgtm

@karianna karianna merged commit 05c653e into adoptium:master Feb 17, 2022
@@ -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 :-)

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.

None yet

4 participants