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

[BinaryPlatforms]: fix triplet breakage #2042

Merged
merged 1 commit into from
Sep 25, 2020
Merged

Conversation

staticfloat
Copy link
Member

We momentarily broke the MacOS (and FreeBSD, although I'm not sure that
was actually noticed ;P) ecosystem by changing slightly the rules around
triplet(::Platform). Base.BinaryPlatforms keeps track of the
os_version and appends it to the end of the triplet for MacOS and
FreeBSD, but on older versions of julia they are always expected to be
14 and 11.1, respectively. This PR maintains that willful ignorance
when an old package calls Pkg.BinaryPlatforms.triplet(), but for new
packages that are ready to wake up and stop living in a simulation, they
can use Base.BinaryPlatforms.triplet() to get the full, glorious,
properly-versioned triplet string.

We momentarily broke the MacOS (and FreeBSD, although I'm not sure that
was actually noticed ;P) ecosystem by changing slightly the rules around
`triplet(::Platform)`.  `Base.BinaryPlatforms` keeps track of the
`os_version` and appends it to the end of the triplet for `MacOS` and
`FreeBSD`, but on older versions of julia they are always expected to be
`14` and `11.1`, respectively.  This PR maintains that willful ignorance
when an old package calls `Pkg.BinaryPlatforms.triplet()`, but for new
packages that are ready to wake up and stop living in a simulation, they
can use `Base.BinaryPlatforms.triplet()` to get the full, glorious,
properly-versioned triplet string.
@staticfloat staticfloat force-pushed the sf/fix_triplet_breakage branch from 83d222f to c97295f Compare September 24, 2020 17:50
@KristofferC
Copy link
Member

Tests fail on Linux

Platform properties: Test Failed at /home/travis/build/JuliaLang/Pkg.jl/test/binaryplatforms.jl:82

  Expression: triplet(MacOS()) == "x86_64-apple-darwin14"

   Evaluated: "x86_64-apple-darwin14-os_version+14.0.0" == "x86_64-apple-darwin14"

etc

@staticfloat
Copy link
Member Author

Like a magician, I wave my hands and suddenly it starts working. (It was waiting on a new nightly)

The windows nightly itself seems borked, but that's unrelated to this PR.

@KristofferC
Copy link
Member

Coming into this PR ready to merge:

giphy

appveyor.yml Outdated
@@ -1,5 +1,5 @@
environment:
APPVEYOR_RDP_PASSWORD: juliadebugging42
APPVEYOR_RDP_PASSWORD: juliadebugging42PLEASE
Copy link
Member

Choose a reason for hiding this comment

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

giphy

Copy link
Member Author

Choose a reason for hiding this comment

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

It's only weird if it doesn't work

@staticfloat staticfloat force-pushed the sf/fix_triplet_breakage branch from db8e1d0 to c97295f Compare September 25, 2020 21:18
@staticfloat
Copy link
Member Author

Alright, I think I figured out the windows issue, PR here: JuliaLang/julia#37758

In the meantime, Kristoffer, I think this PR is ready for your attentions again. :)

@staticfloat staticfloat merged commit b8ea6e5 into master Sep 25, 2020
@staticfloat staticfloat deleted the sf/fix_triplet_breakage branch September 25, 2020 23:39
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.

2 participants