Fix .travis-docker.sh when opam 2 is used#237
Merged
edwintorok merged 1 commit intoocaml:masterfrom Aug 9, 2018
gaborigloi:fix_travis_docker_opam2
Merged
Fix .travis-docker.sh when opam 2 is used#237edwintorok merged 1 commit intoocaml:masterfrom gaborigloi:fix_travis_docker_opam2
edwintorok merged 1 commit intoocaml:masterfrom
gaborigloi:fix_travis_docker_opam2
Conversation
Previously the git pull did not work, because the master branch was checked out, and it failed to merge from the 2.0.0 branch. So make sure we check out the 2.0.0 branch first before pulling. Signed-off-by: Gabor Igloi <gabor.igloi@citrix.com>
Contributor
Author
|
This caused a Travis failure for one of our repos: https://travis-ci.org/xapi-project/nbd/jobs/414002003 I've tested the new script with Alpine and various Debian versions and it worked fine for me. |
edwintorok
approved these changes
Aug 9, 2018
Collaborator
edwintorok
left a comment
There was a problem hiding this comment.
Thanks, perhaps the history of the 2 branches diverged at some point.
Contributor
Author
|
It did. I've checked it. |
samoht
added a commit
to samoht/opam-repository
that referenced
this pull request
Sep 24, 2018
CHANGES: * Set variables before installing ppas (ocaml/ocaml-ci-scripts#234, @samoht) * Fix name of system switch when using INSTALL_LOCAL=1 (ocaml/ocaml-ci-scripts#236, @samoht) * Fix .travis-docker.sh when opam 2 is used (ocaml/ocaml-ci-scripts#237, @gaborigloi) * Add support for BASE_REMOTE_BRANCH (ocaml/ocaml-ci-scripts#239, @lindig) * Create a new switch if not pre-installed (ocaml/ocaml-ci-scripts#242, @NathanReb) * Better lint for opam 1.2 files when using opam2 (ocaml/ocaml-ci-scripts#245, @samoht)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Previously the git pull did not work, because the master branch was
checked out, and it failed to merge from the 2.0.0 branch. So make sure
we check out the 2.0.0 branch first before pulling.
Signed-off-by: Gabor Igloi gabor.igloi@citrix.com