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

Use opam2 #232

Merged
merged 6 commits into from
Aug 2, 2018
Merged

Use opam2 #232

merged 6 commits into from
Aug 2, 2018

Conversation

samoht
Copy link
Member

@samoht samoht commented Jul 16, 2018

No description provided.

@samoht
Copy link
Member Author

samoht commented Jul 16, 2018

I'm testing that PR with mirage/ocaml-conduit#267

@samoht samoht force-pushed the opam2 branch 2 times, most recently from 1e3a6b0 to c82c1ba Compare July 16, 2018 13:37
.travis-ocaml.sh Outdated
exit 1 ;;
esac
install_opam2 () {
sudo wget https://github.com/ocaml/opam/releases/download/2.0.0-rc3/opam-2.0.0-rc3-x86_64-linux -O /usr/local/bin/opam ;;
Copy link
Member

@kit-ty-kate kit-ty-kate Jul 16, 2018

Choose a reason for hiding this comment

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

mmh maybe a sudo chmod +x /usr/local/bin/opam is going to be missing at some point I guess. (sorry I forgot that)

@samoht samoht force-pushed the opam2 branch 6 times, most recently from a367a43 to bd3eefc Compare July 17, 2018 07:13
.travis-ocaml.sh Outdated
exit 1 ;;
esac
install_opam2 () {
sudo add-apt-repository ppa:ansible/bubblewrap
Copy link
Contributor

Choose a reason for hiding this comment

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

Should'nt sandboxing disabled for CI? Besides, for ubuntu, bwrap is not yet available on all versions.

Copy link
Member Author

Choose a reason for hiding this comment

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

It's available on the ubuntu image used by Travis CI. Also recursive sandboxing is available for these images as they are running them in privilege mode.

.travis-docker.sh is using the ability to run unprivileged docker images on the Travis CI infrastructure, so has different constraints and different of setting everything up.

@samoht samoht force-pushed the opam2 branch 6 times, most recently from 7bc299d to 3ac5c90 Compare July 17, 2018 20:28
@samoht
Copy link
Member Author

samoht commented Jul 17, 2018

It's all green but I am not sure it's actually testing anything (see ocaml/opam#3463).

Also, the PR uncovered a bug with opam remove -a with opam2, the workaround (removing every package manually) is not pretty but it seems to work.

@samoht
Copy link
Member Author

samoht commented Jul 18, 2018

So it seems to compile the packages fine, even when printing the ccache error. Not sure what it is about ...

@samoht samoht force-pushed the opam2 branch 6 times, most recently from ebbdba6 to cf5fc45 Compare July 18, 2018 17:06
@samoht
Copy link
Member Author

samoht commented Jul 19, 2018

This is ready to review/merge: f4f2a70 passed all the tests as well as mirage/ocaml-conduit#267.

The removal of Xquartz on OSX made the script more reliable (as it won't fail trying to install the dmg for ever) and fast (from 15min to 12min on that PR). It will break some packages (the ones using X11 like extensions to the graphics library), but that could be re-enabled on a per repository bases by adding INSTALL_XQUARTZ=true to the environment variables.

@hannesm
Copy link
Member

hannesm commented Jul 19, 2018

I looked through the diff, this looks pretty good. What is missing is updates of the documentation in (at least) README-travis.md. I'm a bit worries why travis on this PR fails (during opam lint) - is this supposed to happen (i.e. will all users of ocaml-ci-script fail unless their opam files are updated to 2.0 in the respective repositories)? I'm not sure when the best time is to introduce a breaking change (change of the default version of OPAM).

@samoht
Copy link
Member Author

samoht commented Jul 19, 2018

@hannesm I've removed the commit which were using my fork/branch to compile yorick. With that commit, everything was working fine (see the status of f4f2a70). That PR should not bring any visible difference to users (unless it's a new error specific to the use of opam2).

I'll add a bit of documentation.

@samoht samoht merged commit 837da80 into ocaml:master Aug 2, 2018
@samoht samoht deleted the opam2 branch August 2, 2018 11:27
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)
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.

4 participants