Skip to content

Commit

Permalink
Fix Travis CI build
Browse files Browse the repository at this point in the history
I needed to make the following changes to fix the Travis build:

- Add missing fields to the opam file

- Use the make variable in the opam file instead of the "make" command -
  this change is necessary for the "opam lint" check pass.

- Use a version of cow package that has cow.syntax - Cow 2.0.0 has
  removed camlp4 syntax extension support:
  https://github.com/mirage/ocaml-cow/blob/master/CHANGES.md

- Remove invalid flake8 option

Signed-off-by: Gabor Igloi <gabor.igloi@citrix.com>
  • Loading branch information
gaborigloi committed Nov 18, 2016
1 parent 420d941 commit b874095
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ install:
- wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-opam.sh
- pip install --user flake8
script:
- flake8 --show-source --show-pep8 python
- flake8 --show-source python
- bash -ex .travis-opam.sh
env:
- OCAML_VERSION=4.02 PACKAGE=xapi-storage
12 changes: 9 additions & 3 deletions opam
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
opam-version: "1"
opam-version: "1.2"
maintainer: "dave.scott@citrix.com"
authors: "xen-api@lists.xen.org"
homepage: "https://xapi-project.github.io/"
bug-reports: "https://github.com/xapi-project/xapi-storage/issues"
dev-repo: "git://github.com/xapi-project/xapi-storage.git"
build: [
[make]
]
install: [
[make "install" "PREFIX=%{prefix}%"]
]
remove: [
["make" "uninstall" "PREFIX=%{prefix}%"]
[make "uninstall" "PREFIX=%{prefix}%"]
]
depends: [
"cow"
"cow" {< "2.0.0"}
"rpc"
"caml2html"
"xmlm"
Expand Down

0 comments on commit b874095

Please sign in to comment.