Fix BASE_REMOTE in .travis-docker.sh in CentOS 7 containers#222
Merged
Conversation
When I specified a BASE_REMOTE that is completely separate from the opam-repository, the older git version in the CentOS 7 container printed a "no common commits" warning and failed to get the contents of the master branch of the BASE_REMOTE. I've fixed this by changing the fetch command to fetch the whole remote, not just the master branch, this works in CentOS 7 too. This is probably still more efficient for BASE_REMOTEs that are forks of opam-repository than just deleting the directory and cloning BASE_REMOTE. Signed-off-by: Gabor Igloi <gabor.igloi@citrix.com>
edwintorok
approved these changes
Mar 19, 2018
Collaborator
There was a problem hiding this comment.
It is unfortunate that older versions of git have different behaviour like this, it looks like git versions older than 1.8.4 (yep 5 years old, but CentOS 7 still has only 1.8.3.1) would not update refs/remotes/origin/master, which is what the git reset relies on: https://github.com/git/git/blob/master/Documentation/RelNotes/1.8.4.txt#L226-L232
samoht
added a commit
to samoht/opam-repository
that referenced
this pull request
Aug 2, 2018
CHANGES: * `OCAML_VERSION=4.06` now uses 4.06.1 instead 4.06.0 (ocaml/ocaml-ci-scripts#218, @yomimono) * Fix travis docker when the current image is using the system switch (ocaml/ocaml-ci-scripts#219, @kit-ty-kate) * Fix opam 1.3/2.0 json format parsing (ocaml/ocaml-ci-scripts#220, @kit-ty-kate) * Fix BASE_REMOTE in .travis-docker.sh in CentOS 7 containers (ocaml/ocaml-ci-scripts#222, @gaborigloi) * update some version numbers in travis readme (ocaml/ocaml-ci-scripts#224, @yomimono) * (not so) temporary workaround for python failure on OS X (ocaml/ocaml-ci-scripts#225, @fdopen) * travis-docker: try to make git quieter (ocaml/ocaml-ci-scripts#227, @mor1) * Add branches for OCaml 4.07 (ocaml/ocaml-ci-scripts#230, @Leonidas-from-XIV) * Use opam2 by default (ocaml/ocaml-ci-scripts#232, @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.
When I specified a BASE_REMOTE that is completely separate from the
opam-repository, the older git version in the CentOS 7 container printed
a "no common commits" warning and failed to get the contents of the
master branch of the BASE_REMOTE.
I've fixed this by changing the fetch command to fetch the whole remote,
not just the master branch, this works in CentOS 7 too. This is probably
still more efficient for BASE_REMOTEs that are forks of opam-repository
than just deleting the directory and cloning BASE_REMOTE.
Signed-off-by: Gabor Igloi gabor.igloi@citrix.com