Skip to content

Commit

Permalink
Merge pull request #74 from avsm/opam-pkg
Browse files Browse the repository at this point in the history
OPAM packaging
  • Loading branch information
avsm committed Jan 5, 2016
2 parents 15e2a93 + 2e439aa commit f9f8ee3
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
*.cm?
travis-opam
/_build/
*.byte
*.native
8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.PHONY: all clean

all:
ocamlbuild -tag use_unix travis_opam.byte
ocamlbuild -tag use_unix travis_mirage.byte

clean:
rm -rf _build
4 changes: 3 additions & 1 deletion opam
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
opam-version: "1.2"
maintainer: "thomas@gazagnaire.org"
homepage: "https://github.com/ocaml/ocaml-travisci-skeleton"
bug-reports: "https://github.com/ocaml/ocaml-travisci-skeleton/issues"
dev-repo: "https://github.com/ocaml/ocaml-travisci-skeleton.git"
authors: [
"Thomas Gazagnaire"
"Richard Mortier"
"David Sheets"
]

build: ["echo" "OK!"]
build: [make]
4 changes: 4 additions & 0 deletions travis-opam.install
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
bin: [
"?_build/travis_opam.byte" {"travis-opam"}
"?_build/travis_mirage.byte" {"travis-mirage"}
]
1 change: 1 addition & 0 deletions travis_mirage.ml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ let extra_remotes = list (getenv_default "EXTRA_REMOTES" "")
let pins = list (getenv_default "PINS" "")

(* Mirage deployment environment *)
let (|>) a b = b a
let is_deploy = getenv_default "DEPLOY" "false" |> fuzzy_bool_of_string
let is_travis_pr =
getenv_default "TRAVIS_PULL_REQUEST" "false" |> fuzzy_bool_of_string
Expand Down
2 changes: 1 addition & 1 deletion travis_opam.ml
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ begin (* tests *)
echo "TESTS=false, skipping the test run.";
end;

begin (* optioanal dependencies *)
begin (* optional dependencies *)
let depopts_run = match depopts_run with
| [] | ["false"] -> None
| ["*"] -> (* query OPAM *)
Expand Down

0 comments on commit f9f8ee3

Please sign in to comment.