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

Config file - opam root bump to format-version '2.1' + travis #4280

Merged
merged 8 commits into from
Jul 23, 2020

Conversation

rjbou
Copy link
Collaborator

@rjbou rjbou commented Jul 21, 2020

As new fields was added (depext ones), we need to upgrade to avoid syntax errors with an opam 2.0 bnary
fix #4266

@rjbou rjbou added this to the 2.1.0~alpha2 milestone Jul 21, 2020
@rjbou rjbou changed the title Config file - opam root bump to format-version '2.1' Config file - opam root bump to format-version '2.1' + travis Jul 22, 2020
@rjbou
Copy link
Collaborator Author

rjbou commented Jul 22, 2020

Updated travis in the same time, to handle upgrade directly (from bootstrap & cache). And upgrade from 1.2 test fix, it was succeeding without doing the upgrade.

Copy link
Member

@dra27 dra27 left a comment

Choose a reason for hiding this comment

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

I'd suggest baking an override into the dune files for the git-sha using a fallback rule, rather than manually editing them with sed. That change in Dune has certainly boiled my blood enough already 🙂 The src/client/no-git-version file should go in .gitignore as well.

.travis-ci.sh Show resolved Hide resolved
.travis-ci.sh Outdated Show resolved Hide resolved
src/client/dune Outdated Show resolved Hide resolved
src/client/dune Show resolved Hide resolved
.travis-ci.sh Show resolved Hide resolved
.travis-ci.sh Outdated Show resolved Hide resolved
.travis-ci.sh Outdated Show resolved Hide resolved
.travis-ci.sh Outdated Show resolved Hide resolved
.travis-ci.sh Show resolved Hide resolved
Co-authored-by: David Allsopp <david.allsopp@metastack.com>
@rjbou rjbou merged commit c148cbc into ocaml:master Jul 23, 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.

Better error message when using old opam with new root
2 participants