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

2.0.6 backported commits #3973

Merged
merged 10 commits into from Jan 13, 2020
Merged

2.0.6 backported commits #3973

merged 10 commits into from Jan 13, 2020

Conversation

@rjbou
Copy link
Collaborator

rjbou commented Aug 30, 2019

Backported commits for 2.0.6 release.

commit iss pr descr
708711b #3831 Don't remove git cache objects that may be used
bb6bb76 #3828  #3873 Don't include .gitattributes in index.tar.gz
3634880 #3878 #3886 fish: add colon for fish manpath
d37335d #3957 Do not fail if $HOME/.ccache is missing
0038dcc #3842 #4006 cold: check for patch & bunzip2
20f4cac #3999 avoid copying extraneous files in opam-devel example
ee2eca0 #4012 #4019 add dune cache as rw
030e833 #4038 fix precise tracking cached entries retrieveing

Also (not in this PR)

pr descr
#3934 hygiene stage to check install.sh & configure
#3936 dune man pages generation
#3939 lock: add warning in case of missing locked file
#4041 backport of upgrade from 1.2 travis changes, ocaml 4.08/09 test
@dra27

This comment has been minimized.

Copy link
Contributor

dra27 commented Aug 30, 2019

Was #3886 going to go in as well, or is it already in?

@dra27

This comment has been minimized.

Copy link
Contributor

dra27 commented Aug 30, 2019

Could also do a release of ocaml-mccs (which I think fixes the GLPK vendoring properly) and switch 2.0 to use the +11 release?

@rjbou

This comment has been minimized.

Copy link
Collaborator Author

rjbou commented Aug 30, 2019

Of course, this PR is not fixed. Commits/PR proposals are welcome!

@rjbou rjbou changed the title 2.0.6 2.0.6 backported commits Sep 2, 2019
@rjbou rjbou force-pushed the OCamlPro:2.0.6 branch 2 times, most recently from 74e08cc to 0038dcc Oct 16, 2019
@rjbou rjbou added this to the 2.0.6 milestone Oct 22, 2019
@XVilka

This comment has been minimized.

Copy link
Contributor

XVilka commented Dec 10, 2019

What about including the sorting feature in this upcoming release?
#3866

@dra27

This comment has been minimized.

Copy link
Contributor

dra27 commented Dec 10, 2019

@XVilka - that PR’s still WIP and adds a feature, not a bug fix, which isn’t how maintenance releases (are supposed to) work!

@hannesm

This comment has been minimized.

Copy link
Member

hannesm commented Dec 10, 2019

I'd be in favour of including the bugfix #4038 in the next release (or removing the digest cache entirely)

AltGr and others added 4 commits Apr 19, 2019
This is a quickfix, we can probably do better than that ; see #3828
bwrap/osx: do not fail if $HOME/.ccache is missing: check for directory existence in `add_mounts`

See https://discuss.ocaml.org/t/dune-1-11-1-compilation-failed/4248

This was already present in bwrap, so only sandbox needs to be updated

Signed-off-by: Marcello Seri <marcello.seri@gmail.com>
@rjbou rjbou force-pushed the OCamlPro:2.0.6 branch from 27ec716 to b8b44f2 Dec 13, 2019
@rjbou rjbou force-pushed the OCamlPro:2.0.6 branch from b8b44f2 to 670dcd0 Jan 8, 2020
@AltGr AltGr merged commit 5e7ed05 into ocaml:2.0 Jan 13, 2020
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
You can’t perform that action at this time.