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

Supersede local file over network download #2458

Merged
merged 1 commit into from
Feb 8, 2021

Conversation

M-Davies
Copy link

@M-Davies M-Davies commented Feb 8, 2021

  • Local platform configs will now superceed network locations
  • Build will fail if a local file doesn't exist and PLATFORM_CONFIG_LOCATION is unset

Signed-off-by: Morgan Davies [email protected]

@M-Davies M-Davies added enhancement Issues that enhance the code or documentation of the repo in any way important High priority issues that are not buildbreakers but may still require more attention than others labels Feb 8, 2021
@M-Davies M-Davies requested a review from sxa February 8, 2021 13:26
@karianna karianna added this to the February 2021 milestone Feb 8, 2021
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

@M-Davies M-Davies marked this pull request as draft February 8, 2021 14:32
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.

Certainly works for me so I'll approve (as expected, since it was in response to a concern I raised!) although we should possibly make it explicit in a comment to

PLATFORM_CONFIG_FILEPATH="$SCRIPT_DIR/platform-specific-configurations/${OPERATING_SYSTEM}.sh"     
if [ ! -f "${PLATFORM_CONFIG_FILEPATH}" ]

to make it clear that if someone wants to auto-download to take effect then they are expected to delete the local ones from the clone - there is no way to force it to use downloaded ones instead of local ones.

* Local platform configs will now superceed network locations
* Build will fail if a local file doesn't exist and PLATFORM_CONFIG_LOCATION is unset

Signed-off-by: Morgan Davies <[email protected]>
@M-Davies M-Davies marked this pull request as ready for review February 8, 2021 14:49
@karianna karianna merged commit 93b479a into adoptium:master Feb 8, 2021
@M-Davies M-Davies deleted the local_superceed branch April 30, 2021 12:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Issues that enhance the code or documentation of the repo in any way important High priority issues that are not buildbreakers but may still require more attention than others
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants