From 0863d08cb9916abc6c370bb48f3764e987ba7e23 Mon Sep 17 00:00:00 2001 From: David Scott Date: Tue, 14 Nov 2017 11:49:26 +0000 Subject: [PATCH 1/4] Update CHANGES.md for v1.10 Signed-off-by: David Scott --- CHANGES.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 CHANGES.md diff --git a/CHANGES.md b/CHANGES.md new file mode 100644 index 0000000..de4bd81 --- /dev/null +++ b/CHANGES.md @@ -0,0 +1,3 @@ +## v1.10 + +- Fix build with OCaml 4.06 (and `-safe-string`) From e3409e976bf45e7d89ff6c7ace760c8403864b8f Mon Sep 17 00:00:00 2001 From: David Scott Date: Tue, 14 Nov 2017 11:50:49 +0000 Subject: [PATCH 2/4] opam: import from opam-repository sha.1.9 Signed-off-by: David Scott --- sha.opam | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 sha.opam diff --git a/sha.opam b/sha.opam new file mode 100644 index 0000000..ecb5cfd --- /dev/null +++ b/sha.opam @@ -0,0 +1,8 @@ +opam-version: "1.2" +maintainer: "dave@recoil.org" +homepage: "https://github.com/djs55/ocaml-sha" +build: make +remove: [["ocamlfind" "remove" "sha"]] +depends: ["ocamlfind"] +dev-repo: "git://github.com/djs55/ocaml-sha" +install: [make "install"] From 67f3b357f63a7f74c64f5ffce64dc23a67926dd6 Mon Sep 17 00:00:00 2001 From: David Scott Date: Tue, 14 Nov 2017 11:54:45 +0000 Subject: [PATCH 3/4] opam: fix lint errors, expand author list Signed-off-by: David Scott --- sha.opam | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/sha.opam b/sha.opam index ecb5cfd..410440f 100644 --- a/sha.opam +++ b/sha.opam @@ -1,8 +1,19 @@ opam-version: "1.2" -maintainer: "dave@recoil.org" -homepage: "https://github.com/djs55/ocaml-sha" +maintainer: "dave@recoil.org" +authors: [ +"Vincent Hanquez" "Thomas Gazagnaire" "Goswin von Brederlow" + "Eric Cooper" "Florent Monnier" "Forrest L Norvell" + "Vincent Bernadoff" "David Scott" +] +homepage: "https://github.com/djs55/ocaml-sha" +bug-reports: "https://github.com/djs55/ocaml-sha/issues" +dev-repo: "https://github.com/djs55/ocaml-sha.git" +license: "LGPL" + build: make +install: [make "install"] remove: [["ocamlfind" "remove" "sha"]] + depends: ["ocamlfind"] -dev-repo: "git://github.com/djs55/ocaml-sha" -install: [make "install"] + +available: [ ocaml-version >= "4.02.0" ] \ No newline at end of file From 4afa0ed132db51c12ad823a7cfa5239cd0ffa7cf Mon Sep 17 00:00:00 2001 From: David Scott Date: Tue, 14 Nov 2017 11:56:48 +0000 Subject: [PATCH 4/4] travis: add simple Docker-based configuration This tests the minimum OCaml version (4.02) and the latest current (4.06) Signed-off-by: David Scott --- .travis.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..7645ce0 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,13 @@ +language: c +sudo: false +services: + - docker +install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-docker.sh +script: bash ./.travis-docker.sh +env: + global: + - PINS="sha:." + - PACKAGE="sha" + matrix: + - DISTRO=alpine OCAML_VERSION=4.02.0 + - DISTRO=alpine OCAML_VERSION=4.06.0