Skip to content

Fix bug in bottles#6144

Merged
MikeMcQuaid merged 2 commits intoHomebrew:masterfrom
xu-cheng:bottle
May 20, 2019
Merged

Fix bug in bottles#6144
MikeMcQuaid merged 2 commits intoHomebrew:masterfrom
xu-cheng:bottle

Conversation

@xu-cheng
Copy link
Copy Markdown
Contributor

@xu-cheng xu-cheng commented May 17, 2019

Before:

$ brew ruby -e 'p HOMEBREW_BOTTLE_DEFAULT_DOMAIN'
nil

After:

$ brew ruby -e 'p HOMEBREW_BOTTLE_DEFAULT_DOMAIN'
"https://homebrew.bintray.com"

Closes https://github.com/Homebrew/linuxbrew-core/issues/13110.

/cc @sjackman

Comment thread Library/Homebrew/brew.sh Outdated
Comment thread Library/Homebrew/dev-cmd/bottle.rb Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

What's this bit for? Not disagreeing just curious.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This code has a purpose. Part of the macOS bottling pipeline runs on Linux, where HOMEBREW_BOTTLE_DEFAULT_DOMAIN is https://linuxbrew.bintray.com/bottles. We can end up with the opposite problem, where we'd have root_url "https://homebrew.bintray.com/bottles" in bottles.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This code has a purpose. Part of the macOS bottling pipeline runs on Linux, where HOMEBREW_BOTTLE_DEFAULT_DOMAIN is https://linuxbrew.bintray.com/bottles.

It is no longer in this case as we now set HOMEBREW_FORCE_HOMEBREW_ON_LINUX in brew test-bot.

Further, reverting this would also help to remove superfluous root_url in linuxbrew/xorg and linuxbrew/extra.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Fine with me if/when it's fine with @sjackman.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Fine with me then. Thanks, @xu-cheng.

Comment thread Library/Homebrew/dev-cmd/bottle.rb Outdated
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This code has a purpose. Part of the macOS bottling pipeline runs on Linux, where HOMEBREW_BOTTLE_DEFAULT_DOMAIN is https://linuxbrew.bintray.com/bottles. We can end up with the opposite problem, where we'd have root_url "https://homebrew.bintray.com/bottles" in bottles.

@sjackman
Copy link
Copy Markdown
Contributor

Thanks for this fix, @xu-cheng!

xu-cheng added 2 commits May 20, 2019 15:09
This reverts commit e4f4e0f.

This is no longer necessary as `HOMEBREW_FORCE_HOMEBREW_ON_LINUX`
is set when uploading bottles for Homebrew.
@MikeMcQuaid MikeMcQuaid merged commit 7f4aefe into Homebrew:master May 20, 2019
@MikeMcQuaid
Copy link
Copy Markdown
Member

Thanks again @xu-cheng!

@xu-cheng xu-cheng deleted the bottle branch May 20, 2019 19:53
@lock lock bot added the outdated PR was locked due to age label Jan 1, 2020
@lock lock bot locked as resolved and limited conversation to collaborators Jan 1, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

outdated PR was locked due to age

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants