Skip to content

Commit

Permalink
Add 4.03.0dev support as an allowed_failure into Travis
Browse files Browse the repository at this point in the history
  • Loading branch information
avsm authored and AltGr committed Jul 18, 2015
1 parent 036f5db commit f810c78
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .travis-ci-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ install_on_linux () {
4.02.1,1.1.1) ppa=avsm/ocaml42+opam11 ;;
4.02.1,1.2.0) ppa=avsm/ocaml42+opam120 ;;
4.02.1,1.2.1) ppa=avsm/ocaml42+opam12 ;;
4.03.0,1.2.1) ppa=avsm/ocaml42+opam12 ;;
*) echo Unknown $OCAML_VERSION,$OPAM_VERSION; exit 1 ;;
esac

Expand All @@ -42,6 +43,7 @@ install_on_osx () {
case "$OCAML_VERSION,$OPAM_VERSION" in
4.02.1,1.2.0) brew update; brew install opam ;;
4.02.1,1.2.1) brew update; brew install opam --HEAD ;;
4.03.0,1.2.1) brew update; brew install ocaml --HEAD; brew install opam --HEAD ;;
*) echo Unknown $OCAML_VERSION,$OPAM_VERSION; exit 1 ;;
esac
}
Expand Down
16 changes: 9 additions & 7 deletions .travis-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ opam --git-version

export OPAMYES=1

case $TRAVIS_OS_NAME in
osx) export OPAMFETCH=wget ;;
esac

cd $TRAVIS_BUILD_DIR
echo Pull request:
cat pullreq.diff
Expand Down Expand Up @@ -53,14 +57,12 @@ function build_one {
echo build one: $pkg
rm -rf ~/.opam
opam init .
echo Current switch is:
opam switch

case $TRAVIS_OS_NAME in
osx) # https://github.com/ocaml/opam/issues/2164
echo 'download-command: wget' >> $HOME/.opam/config
case "$OCAML_VERSION" in
4.03.0) opam switch -y 4.03.0dev+trunk ;;
*) echo Current switch is:
opam switch ;;
esac

eval `opam config env`
# test for installability
echo "Checking for availability"
if ! opam install $pkg --dry-run; then
Expand Down
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,13 @@ env:
- OCAML_VERSION=3.12.1 OPAM_VERSION=1.2.1
- OCAML_VERSION=4.02.1 OPAM_VERSION=1.2.1
- OCAML_VERSION=4.02.1 OPAM_VERSION=1.2.0
- OCAML_VERSION=4.03.0 OPAM_VERSION=1.2.1
matrix:
allow_failures:
- env: OCAML_VERSION=4.02.1
- os: osx
allow_failures:
- env: OCAML_VERSION=4.03.0
exclude:
- os: osx
env: OCAML_VERSION=3.12.1 OPAM_VERSION=1.1.1
Expand All @@ -38,6 +41,8 @@ matrix:
env: OCAML_VERSION=4.02.1 OPAM_VERSION=1.1.1
- os: osx
env: OCAML_VERSION=4.02.1 OPAM_VERSION=1.2.0
- os: osx
env: OCAML_VERSION=4.03.0 OPAM_VERSION=1.2.1
notifications:
email:
- opam-commits@lists.ocaml.org
Expand Down

0 comments on commit f810c78

Please sign in to comment.