Skip to content

Commit

Permalink
Update opam file and travis-ci scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
alavrik committed May 31, 2016
1 parent db8dcca commit 7351594
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 17 deletions.
18 changes: 4 additions & 14 deletions .travis-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,10 @@ sudo apt-get install protobuf-compiler


# build, run tests, build package, install package
wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-opam.sh
wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-opam.sh

. .travis-opam.sh


# build and test using the current development version of piqilib
if [ -n "${PIQILIB_DEV-}" ]
then
opam repo add piqi git://github.com/piqi/piqi-opam-repo.git

opam install piqilib.master

make distclean
make
make test
fi
# opam lint is way too demanding and varies from version to version
export OPAM_LINT=false

. .travis-opam.sh
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,7 @@ env:
- PACKAGE="piqi" OCAML_VERSION=3.12
- PACKAGE="piqi" OCAML_VERSION=4.00
- PACKAGE="piqi" OCAML_VERSION=4.01
- PACKAGE="piqi" OCAML_VERSION=4.02 PIQILIB_DEV=1
- PACKAGE="piqi" OCAML_VERSION=latest
- PACKAGE="piqi" OCAML_VERSION=4.02
- PACKAGE="piqi" OCAML_VERSION=4.03
# development version of piqilib
- PACKAGE="piqi" OCAML_VERSION=4.03 PINS=piqilib
5 changes: 4 additions & 1 deletion opam
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
opam-version: "1"
opam-version: "1.2"
maintainer: "[email protected]"
build: [
[make]
]
install: [
[make "DESTDIR=%{prefix}%" "install"]
]
remove: [
Expand All @@ -14,3 +16,4 @@ depends: [
"piqilib"
"base-bytes"
]
dev-repo: "git://github.com/alavrik/piqi-ocaml"

0 comments on commit 7351594

Please sign in to comment.