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

[ext/HSG]: Store next release _and_ latest nightly #2418

Merged
merged 1 commit into from
Mar 1, 2021

Conversation

staticfloat
Copy link
Member

@staticfloat staticfloat commented Mar 1, 2021

In the event that we are in an RC phase where we have three "latest"
branch tips (e.g. latest stable: 1.5.3, latest RC: 1.6.0-rc1 and latest
master: 1.7.0-DEV) each with their own set of standard libraries, we
must store this information in Pkg so that we pass tests when running on
latest master. It is harmless for this information to be baked into an
older Julia, as we make no guarantees that Julia 1.6.0 final should have
perfect information about what standard libraries 1.7.0 will have.

Fixes #2410

@staticfloat
Copy link
Member Author

This should be merged after #2417

@DilumAluthge
Copy link
Member

@staticfloat Can you resolve the merge conflicts?

Alternatively, since I just merged #2417 to master, it might be easier for you to just redo this commit from scratch starting with the latest master.

In the event that we are in an RC phase where we have three "latest"
branch tips (e.g. latest stable: 1.5.3, latest RC: 1.6.0-rc1 and latest
`master`: 1.7.0-DEV) each with their own set of standard libraries, we
must store this information in Pkg so that we pass tests when running on
latest `master`. It is harmless for this information to be baked into an
older Julia, as we make no guarantees that Julia 1.6.0 final should have
perfect information about what standard libraries 1.7.0 will have.
@staticfloat
Copy link
Member Author

Yeah, it's because it bundled the commit you just merged. Silly git, you should know that those two were the same commit!

@DilumAluthge
Copy link
Member

Yeah, it's because it bundled the commit you just merged. Silly git, you should know that those two were the same commit!

Classic Git.

@DilumAluthge
Copy link
Member

Yeah, it's because it bundled the commit you just merged. Silly git, you should know that those two were the same commit!

Classic Git.

I guess this is the kind of thing that Pijul is supposed to solve.

@DilumAluthge DilumAluthge merged commit 7a9d965 into master Mar 1, 2021
@DilumAluthge DilumAluthge deleted the sf/nightly_stdlibs branch March 1, 2021 22:34
KristofferC pushed a commit that referenced this pull request Mar 2, 2021
In the event that we are in an RC phase where we have three "latest"
branch tips (e.g. latest stable: 1.5.3, latest RC: 1.6.0-rc1 and latest
`master`: 1.7.0-DEV) each with their own set of standard libraries, we
must store this information in Pkg so that we pass tests when running on
latest `master`. It is harmless for this information to be baked into an
older Julia, as we make no guarantees that Julia 1.6.0 final should have
perfect information about what standard libraries 1.7.0 will have.

(cherry picked from commit 7a9d965)
KristofferC pushed a commit that referenced this pull request Mar 2, 2021
In the event that we are in an RC phase where we have three "latest"
branch tips (e.g. latest stable: 1.5.3, latest RC: 1.6.0-rc1 and latest
`master`: 1.7.0-DEV) each with their own set of standard libraries, we
must store this information in Pkg so that we pass tests when running on
latest `master`. It is harmless for this information to be baked into an
older Julia, as we make no guarantees that Julia 1.6.0 final should have
perfect information about what standard libraries 1.7.0 will have.

(cherry picked from commit 7a9d965)
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.

Bug: The "STDLIBS_BY_VERSION up-to-date" test is currently broken
4 participants