Skip to content

Commit aec08b1

Browse files
committed
Merge pull request #23 from frenetic-lang/travis
Travis-CI reorg
2 parents fa1715e + 27174a7 commit aec08b1

File tree

2 files changed

+28
-8
lines changed

2 files changed

+28
-8
lines changed

.travis-ci.sh

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
OPAM_DEPENDS="cstruct quickcheck ounit pa_ounit"
2-
31
case "$OCAML_VERSION,$OPAM_VERSION" in
42
3.12.1,1.0.0) ppa=avsm/ocaml312+opam10 ;;
53
3.12.1,1.1.0) ppa=avsm/ocaml312+opam11 ;;
@@ -23,10 +21,18 @@ opam --version
2321
opam --git-version
2422

2523
opam init
24+
eval `opam config env`
25+
export CAML_LD_LIBRARY_PATH="$EXTRA_LD_LIBRARY_PATH:$CAML_LD_LIBRARY_PATH"
2626
opam install ${OPAM_DEPENDS}
2727

28-
eval `opam config env`
29-
export CAML_LD_LIBRARY_PATH="`pwd`/_build/lib:$CAML_LD_LIBRARY_PATH"
30-
ocaml setup.ml -configure --enable-tests --enable-quickcheck
28+
for fdep in $FRENETIC_DEPENDS; do
29+
echo $fdep HEAD
30+
curl "https://api.github.com/repos/frenetic-lang/$fdep/git/refs/heads/master" 2>/dev/null \
31+
| grep sha | cut -d\" -f4
32+
done
33+
opam repository add frenetic-opam https://github.com/frenetic-lang/opam-bleeding.git
34+
opam install ${FRENETIC_DEPENDS//ocaml-/}
35+
36+
ocaml setup.ml -configure ${CONFIG_FLAGS}
3137
make
3238
make test

.travis.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
language: c
22
script: bash -ex .travis-ci.sh
33
env:
4-
- OCAML_VERSION=4.01.0 OPAM_VERSION=1.1.0
5-
- OCAML_VERSION=4.00.1 OPAM_VERSION=1.0.0
6-
- OCAML_VERSION=4.00.1 OPAM_VERSION=1.1.0
4+
global:
5+
- OPAM_DEPENDS="cstruct quickcheck ounit pa_ounit"
6+
- CONFIG_FLAGS="--enable-tests --enable-quickcheck"
7+
- EXTRA_LD_LIBRARY_PATH="$TRAVIS_BUILD_DIR/_build/lib"
8+
matrix:
9+
- OCAML_VERSION=4.01.0 OPAM_VERSION=1.1.0
10+
- OCAML_VERSION=4.00.1 OPAM_VERSION=1.0.0
11+
- OCAML_VERSION=4.00.1 OPAM_VERSION=1.1.0
12+
notifications:
13+
irc:
14+
channels:
15+
- "irc.freenode.net#frenetic"
16+
template:
17+
- "%{repository}#%{build_number} (%{branch} - %{commit}): %{message}"
18+
- "Build details : %{build_url}"
19+
on_success: change
20+
on_failure: always

0 commit comments

Comments
 (0)