Skip to content

Conversation

ararslan
Copy link
Member

@ararslan ararslan commented Dec 30, 2019

VERSION has been set to 1.5.0-DEV, the 1.4 NEWS items have been moved to HISTORY, and NEWS has been cleared out for 1.5 items.

Please don't merge anything to master until this is merged so that versions don't get messed up, since 1.4 has been branched.

@JeffBezanson
Copy link
Member

NEWS needs edits. I'll do a pass.

@Keno
Copy link
Member

Keno commented Dec 31, 2019

Please don't merge anything to master until this is merged so that versions don't get messed up, since 1.4 has been branched.

For future releases, can we just merge this to master whenever and the create the release branch from whatever the commit before was? Trying to lock master without an enforcement mechanism seems potentially problematic.

@ararslan
Copy link
Member Author

Yes, agreed.

@ararslan ararslan merged commit 13d1bd4 into master Dec 31, 2019
@ararslan ararslan deleted the aa/1.5.0-DEV branch December 31, 2019 18:18
@timholy
Copy link
Member

timholy commented Dec 31, 2019

I'm getting

~/src/julia-branch/stdlib$ make
WARNING: using mismatched version for Statistics-a2203d3b67f7413701be5de251622cb85c9cc69d symlink-uninstaller /home/tim/src/julia-branch/usr/share/julia/stdlib/v1.4:
  want Statistics-a2203d3b67f7413701be5de251622cb85c9cc69d symlink-uninstaller /home/tim/src/julia-branch/usr/share/julia/stdlib/v1.5

and

error during bootstrap:
LoadError("sysimg.jl", 16, ArgumentError("Package Statistics not found in current path:\n- Run `import Pkg; Pkg.add(\"Statistics\")` to install the Statistics package.\n"))
require at ./loading.jl:892

at the end of trying to build Julia. Related? Easy fix?

@ararslan
Copy link
Member Author

Very weird, I have not gotten that on any of my systems: I've rebuilt from source with this change on Linux, macOS, and FreeBSD. Perhaps clean it out (git clean -fdx is what I do) and try again?

@timholy
Copy link
Member

timholy commented Dec 31, 2019

Worked, thanks! (Note for anyone who reads this: first save elsewhere any untracked files you don't want deleted.)

@ararslan
Copy link
Member Author

ararslan commented Dec 31, 2019

make distclean-all (or whatever it's called) might work as well and wouldn't delete your stuff.

@vtjnash
Copy link
Member

vtjnash commented Dec 31, 2019

rm -rf usr almost always works too, and is quick

@ViralBShah
Copy link
Member

That would not remove the .o files right? We have too many (4) clean targets. Max level is distcleanall.

mortenpi added a commit to mortenpi/julia that referenced this pull request Jan 5, 2020
Ideally, it should have been updated in JuliaLang#34218. Fix JuliaLang#34259.
KristofferC pushed a commit that referenced this pull request Jan 7, 2020
* Use correct version for master docs

Ideally, it should have been updated in #34218. Fix #34259.

* Update release checklist
KristofferC pushed a commit that referenced this pull request Apr 11, 2020
KristofferC pushed a commit that referenced this pull request Apr 11, 2020
* Use correct version for master docs

Ideally, it should have been updated in #34218. Fix #34259.

* Update release checklist
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.

6 participants