matthieu
/
dune
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1088 from rgrinberg/remove-all-opam-yes 

Remove all --yes from travis
This commit is contained in:
Rudi Grinberg 2018-08-02 12:55:21 +02:00 committed by GitHub
parent a5d0941b14 2e0e674d26
commit d2f31c9517
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.travis-ci.sh
View File

@ -1,6 +1,7 @@
#!/bin/bash -xue #!/bin/bash -xue
PATH=~/ocaml/bin:$PATH; export PATH PATH=~/ocaml/bin:$PATH; export PATH
OPAMYES="true"; export OPAMYES
TARGET="$1"; shift TARGET="$1"; shift
@ -44,14 +45,14 @@ case "$TARGET" in
cd ../.. cd ../..
rm -rf src rm -rf src
rm -rf ~/.opam rm -rf ~/.opam
opam init --yes opam init
eval $(opam config env) eval $(opam config env)
opam install ocamlfind utop ppxlib reason odoc menhir ocaml-migrate-parsetree js_of_ocaml-ppx js_of_ocaml-compiler --yes opam install ocamlfind utop ppxlib reason odoc menhir ocaml-migrate-parsetree js_of_ocaml-ppx js_of_ocaml-compiler
opam remove --yes dune jbuilder \ opam remove dune jbuilder \
`opam list --depends-on jbuilder --installed --short` \ `opam list --depends-on jbuilder --installed --short` \
`opam list --depends-on dune --installed --short` `opam list --depends-on dune --installed --short`
if opam info dune &> /dev/null; then if opam info dune &> /dev/null; then
opam remove dune `opam list --depends-on dune --installed --short` --yes opam remove dune `opam list --depends-on dune --installed --short`
fi fi
fi fi
cp -a ~/.opam ~/.opam-start cp -a ~/.opam ~/.opam-start
@ -66,19 +67,19 @@ case "$TARGET" in
eval $(opam config env) eval $(opam config env)
for pkg in $(opam pin list --short); do for pkg in $(opam pin list --short); do
UPDATE_OPAM=1 UPDATE_OPAM=1
opam pin remove $pkg --no-action --yes opam pin remove $pkg --no-action
opam remove $pkg --yes || true opam remove $pkg || true
done done
if [ ! -e ~/.opam/last-update ] || [ $(cat ~/.opam/last-update) != $DATE ] ; then if [ ! -e ~/.opam/last-update ] || [ $(cat ~/.opam/last-update) != $DATE ] ; then
opam update --yes opam update
echo $DATE> ~/.opam/last-update echo $DATE> ~/.opam/last-update
UPDATE_OPAM=1 UPDATE_OPAM=1
opam upgrade --yes opam upgrade
fi fi
opam list opam list
echo "version: \"1.0+dev$DATE\"" >> dune.opam echo "version: \"1.0+dev$DATE\"" >> dune.opam
opam pin add dune . --no-action --yes opam pin add dune . --no-action
opam install ocamlfind utop ppxlib reason odoc ocaml-migrate-parsetree js_of_ocaml-ppx js_of_ocaml-compiler --yes opam install ocamlfind utop ppxlib reason odoc ocaml-migrate-parsetree js_of_ocaml-ppx js_of_ocaml-compiler
echo -en "travis_fold:end:opam.deps\r" echo -en "travis_fold:end:opam.deps\r"
fi fi
echo -en "travis_fold:start:dune.bootstrap\r" echo -en "travis_fold:start:dune.bootstrap\r"