Skip to content

Commit

Permalink
fix travis ci build
Browse files Browse the repository at this point in the history
move all config file to ci folder
fix the env setup
update dependencies
  • Loading branch information
Et7f3 committed Jul 10, 2019
1 parent e0a648b commit dba6f29
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 45 deletions.
19 changes: 0 additions & 19 deletions .travis-ci.sh

This file was deleted.

14 changes: 0 additions & 14 deletions .travis-install.sh

This file was deleted.

17 changes: 10 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,17 @@ addons:
- ocaml
- opam
- ocaml-native-compilers
install: sh -ex ./autoconf/travis-install.sh
install: sh -ex ./ci/travis-install.sh
cache:
directories:
- ${HOME}/.opam
script: sh -ex ./autoconf/travis-ci.sh
script: sh -ex ./ci/travis-ci.sh && echo true
env:
- OCAML_VERSION=system
- OCAML_VERSION=4.03.0
- OCAML_VERSION=4.04.0
- OCAML_VERSION=4.05.0
- OCAML_VERSION=4.06.1
- OCAML_VERSION=ocaml-system
- OCAML_VERSION=ocaml-base-compiler.4.02.3
- OCAML_VERSION=ocaml-base-compiler.4.03.0
- OCAML_VERSION=ocaml-base-compiler.4.04.0
- OCAML_VERSION=ocaml-base-compiler.4.05.0
- OCAML_VERSION=ocaml-base-compiler.4.06.0
- OCAML_VERSION=ocaml-base-compiler.4.06.1
- OCAML_VERSION=ocaml-base-compiler.4.07.1
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,12 @@ OCP_BUILD_DSTDIR=$(OBUILD_DSTDIR)/ocp-build
OCPLIB_NAMES=debug lang unix file system config compat

CMDLINER_DIR := $(shell ocamlfind query cmdliner)
SEQ_DIR := $(shell ocamlfind query seq)
RE_DIR := $(shell ocamlfind query re)
EXTERNAL_INCLUDES= -I ${CMDLINER_DIR} -I ${RE_DIR}
EXTERNAL_INCLUDES= -I ${CMDLINER_DIR} -I ${SEQ_DIR} -I ${RE_DIR}
EXTERNAL_LIBS=\
${CMDLINER_DIR}/cmdliner.cmxa \
${SEQ_DIR}/seq.cmxa \
${RE_DIR}/re.cmxa

INCLUDES=$(foreach lib, $(OCPLIB_NAMES), -I $($(lib)_SRCDIR)) \
Expand Down Expand Up @@ -58,7 +60,7 @@ OCPLIB_LANG= $(lang_SRCDIR)/ocpList.ml $(lang_SRCDIR)/ocpString.ml \
$(lang_SRCDIR)/ocpArray.ml \
$(lang_SRCDIR)/ocpDigest.ml $(lang_SRCDIR)/ocpToposort.ml \
$(lang_SRCDIR)/ocamllexer.ml $(lang_SRCDIR)/ocpGenlex.ml \
$(lang_SRCDIR)/ocpSubst.ml $(lang_SRCDIR)/ocpReuse.ml
$(lang_SRCDIR)/ocpSubst.ml $(lang_SRCDIR)/ocpReuse.ml

OCPLIB_UNIX= $(unix_SRCDIR)/minUnix.ml $(unix_SRCDIR)/onlyUnix.ml \
$(unix_SRCDIR)/onlyWin32.ml
Expand Down
1 change: 0 additions & 1 deletion autoconf/travis-ci.sh → ci/travis-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,3 @@ PREFIX=$HOME/.opam/$OCAML_VERSION
opam pin add my-package .
opam install my-package
opam remove my-package

3 changes: 1 addition & 2 deletions autoconf/travis-install.sh → ci/travis-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@ opam --version
opam --git-version

opam init
opam switch $OCAML_VERSION

opam switch create $OCAML_VERSION || true
4 changes: 4 additions & 0 deletions opam
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@

opam-version: "1.2"
maintainer: "Fabrice Le Fessant <fabrice.le_fessant@ocamlpro.com>"
synopsis: "Build-system for ocaml"
description: """
Build-system for general use with builtin OCaml rule.
"""
authors: [
"Fabrice Le Fessant <fabrice.le_fessant@ocamlpro.com>"
]
Expand Down

0 comments on commit dba6f29

Please sign in to comment.