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

Update cold compiler to 4.09.1 (2.0 version) #4262

Merged
merged 25 commits into from
Jul 16, 2020
Merged

Conversation

dra27
Copy link
Member

@dra27 dra27 commented Jul 8, 2020

This cherry-picks:

@rjbou rjbou added this to the 2.0.8 milestone Jul 10, 2020
dra27 added 4 commits July 16, 2020 12:19
Version was never written to ~/local/versions - correct this and also
correct the "default" version to be the version returned by the binary,
rather than just assuming it's the correct binary!
@dra27
Copy link
Member Author

dra27 commented Jul 16, 2020

This should pass CI (fingers crossed) - the change to .travis.yml automatically invalidates the caches, but I have also checked that the new code in .travis-ci.sh correctly invalidates the cache.

The problem is that new PRs pull the master branch Travis cache (not sure why they don't pick up the 2.0 one - they do try it). The issue is not the opam root, it's the cached bootstrap opam in ~/local/bin/opam-bootstrap which wasn't being reset. That should now be being done.

If this passes CI here, I'll cherry-pick 3896625 and ac7064b back to master.

@dra27 dra27 force-pushed the cold-4.09.1-2.0 branch from 7618bf5 to ad55fb2 Compare July 16, 2020 12:31
@dra27 dra27 merged commit 92889d9 into ocaml:2.0 Jul 16, 2020
@dra27 dra27 mentioned this pull request Jul 16, 2020
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