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

Jump to bottom

Correct check for alpine when setting up GNUPGHOME #3651

Merged
merged 2 commits into from
Feb 15, 2024
Merged

Correct check for alpine when setting up GNUPGHOME #3651

merged 2 commits into from
Feb 15, 2024

Conversation

andrew-m-leonard
Copy link
Contributor

When build using makejdk-any-platform.sh, OPERATING_SYSTEM is not set:

build/sbin/prepareWorkspace.sh: line 323: OPERATING_SYSTEM: unbound variable

Need to check for Alpine like it does in

temurin-build/build-farm/make-adopt-build-farm.sh

Line 46 in c78dc6c

if [ -r /etc/alpine-release ]; then TARGET_OS=alpine-linux; fi

Also GNUPGHOME setup for Alsa not correct if run directly from makejdk-any-platform.sh

@andrew-m-leonard
Check for Alpine linux in prepareWorkspace.sh not assuming running in…
e93752e 
… build farm

Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Check for Alpine linux in prepareWorkspace.sh not assuming running in…
b8d2bef 
… build farm

Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@github-actions github-actions bot added alpine-linux Issues that affect or relate to the Alpine LINUX OS arm Issues that affect or relate to the ARM OS labels Feb 15, 2024
@andrew-m-leonard andrew-m-leonard requested a review from sxa February 15, 2024 13:12
@andrew-m-leonard andrew-m-leonard self-assigned this Feb 15, 2024
sxa
sxa approved these changes Feb 15, 2024
View reviewed changes
Copy link
Member

@sxa sxa left a comment

Choose a reason for hiding this comment

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

I'd have through we'd have another variable for this, but I'm ok with this fix - thanks.

@andrew-m-leonard
Copy link
Contributor Author

I'd have through we'd have another variable for this, but I'm ok with this fix - thanks.

thanks, not when not called through Adopt farm

adamfarley
adamfarley approved these changes Feb 15, 2024
View reviewed changes
Copy link
Contributor

@adamfarley adamfarley left a comment

Choose a reason for hiding this comment

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

LGTM

@andrew-m-leonard andrew-m-leonard merged commit 88fc1e5 into adoptium:master Feb 15, 2024
38 of 46 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adamfarley adamfarley adamfarley approved these changes

@sxa sxa sxa approved these changes

@xavierfacq xavierfacq xavierfacq approved these changes

Assignees

@andrew-m-leonard andrew-m-leonard

Labels
alpine-linux Issues that affect or relate to the Alpine LINUX OS arm Issues that affect or relate to the ARM OS
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@andrew-m-leonard @xavierfacq @sxa @adamfarley