From c5db770540a1c09ae8ecebc14a02a3a7018fc005 Mon Sep 17 00:00:00 2001 From: Thomas Gazagnaire Date: Tue, 7 Aug 2018 11:04:00 +0200 Subject: [PATCH 1/4] Use opam2 in travis scripts --- .travis-ci-install.sh | 2 +- .travis-ci.sh | 46 +++++++++---------------------------------- .travis.yml | 20 ++++++++++--------- 3 files changed, 21 insertions(+), 47 deletions(-) diff --git a/.travis-ci-install.sh b/.travis-ci-install.sh index 87b469e7aa55..6d0f5688c65d 100644 --- a/.travis-ci-install.sh +++ b/.travis-ci-install.sh @@ -1,4 +1,4 @@ -wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-ocaml.sh +wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-ocaml.sh export OPAM_INIT=false bash -ex .travis-ocaml.sh diff --git a/.travis-ci.sh b/.travis-ci.sh index 4158f8c05a15..6fb093a90fb8 100755 --- a/.travis-ci.sh +++ b/.travis-ci.sh @@ -32,12 +32,6 @@ else fi fi -echo OCaml version -ocaml -version -echo OPAM versions -opam --version -opam --git-version - export OPAMYES=1 case $TRAVIS_OS_NAME in @@ -52,38 +46,10 @@ cat pullreq.diff | sed -E -n -e 's,\+\+\+ b/packages/[^/]*/([^/]*)/.*,\1,p' | so echo To Build: cat tobuild.txt -function opam_version_compat { - local OPAM_MAJOR OPAM_MINOR ocamlv bytev - if [ -n "$opam_version_compat_done" ]; then return; fi - opam_version_compat_done=1 - OPAM_MAJOR=${OPAM_VERSION%%.*} - OPAM_MINOR=${OPAM_VERSION#*.} - OPAM_MINOR=${OPAM_MINOR%%.*} - if [ $OPAM_MAJOR -eq 1 ] && [ $OPAM_MINOR -lt 2 ]; then - opam_version_11=1 - ocamlv=$(ocamlrun -vnum) - bytev=${ocamlv%.*} - curl -L https://opam.ocaml.org/repo_compat_1_1.byte$bytev -o compat.byte - ocamlrun compat.byte - fi -} -opam_version_compat - function build_switch { rm -rf ~/.opam echo "build switch: $OPAM_SWITCH" - if [ -n "${opam_version_11}" ]; then - # Hide OCaml build log - if opam init . --comp=$OPAM_SWITCH > build.log 2>&1 ; then - echo -n - else - rc=$? - cat build.log - exit $rc - fi - else - opam init . --comp=$OPAM_SWITCH - fi + opam init . --comp=$OPAM_SWITCH eval `opam config env` } @@ -106,8 +72,8 @@ function build_one { echo "... package available." echo echo "====== External dependency handling ======" - opam install depext - depext=$(opam depext -ls $pkg --no-sources) + opam install 'depext>=1.1.0' + depext=$(opam depext -ls $pkg) opam depext $pkg echo echo "====== Installing dependencies ======" @@ -132,6 +98,12 @@ function build_one { build_switch +echo OCaml version +ocaml -version +echo OPAM versions +opam --version +opam --git-version + for i in `cat tobuild.txt`; do build_one $i done diff --git a/.travis.yml b/.travis.yml index f9eac9646614..09e3cc5c49ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,23 +8,25 @@ matrix: include: - os: osx osx_image: xcode7.3 - env: OCAML_VERSION=4.06 OPAM_VERSION=1.2.2 + env: OCAML_VERSION=4.06 OPAM_VERSION=2.0.0 - os: linux - env: OCAML_VERSION=4.06 OPAM_VERSION=1.2.2 INSTALL_LOCAL=1 + env: OCAML_VERSION=4.07 OPAM_VERSION=2.0.0 - os: linux - env: OCAML_VERSION=4.05 OPAM_VERSION=1.2.2 + env: OCAML_VERSION=4.06 OPAM_VERSION=2.0.0 INSTALL_LOCAL=1 - os: linux - env: OCAML_VERSION=4.04 OPAM_VERSION=1.2.2 + env: OCAML_VERSION=4.05 OPAM_VERSION=2.0.0 - os: linux - env: OCAML_VERSION=4.03 OPAM_VERSION=1.2.2 + env: OCAML_VERSION=4.04 OPAM_VERSION=2.0.0 - os: linux - env: OCAML_VERSION=4.02 OPAM_VERSION=1.2.2 + env: OCAML_VERSION=4.03 OPAM_VERSION=2.0.0 - os: linux - env: OCAML_VERSION=4.01 OPAM_VERSION=1.2.2 + env: OCAML_VERSION=4.02 OPAM_VERSION=2.0.0 - os: linux - env: OCAML_VERSION=4.00 OPAM_VERSION=1.2.2 + env: OCAML_VERSION=4.01 OPAM_VERSION=2.0.0 - os: linux - env: OCAML_VERSION=3.12 OPAM_VERSION=1.2.2 + env: OCAML_VERSION=4.00 OPAM_VERSION=2.0.0 + - os: linux + env: OCAML_VERSION=3.12 OPAM_VERSION=2.0.0 notifications: email: - opam-commits@lists.ocaml.org From 499751b48e643be4f264e16953a666a3e8817bb8 Mon Sep 17 00:00:00 2001 From: Thomas Gazagnaire Date: Wed, 8 Aug 2018 16:46:54 +0200 Subject: [PATCH 2/4] Remove tests for 3.12 --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 09e3cc5c49ef..430a3dc7e9ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,8 +25,6 @@ matrix: env: OCAML_VERSION=4.01 OPAM_VERSION=2.0.0 - os: linux env: OCAML_VERSION=4.00 OPAM_VERSION=2.0.0 - - os: linux - env: OCAML_VERSION=3.12 OPAM_VERSION=2.0.0 notifications: email: - opam-commits@lists.ocaml.org From 0691ffcbec8443a18711f2c7908847ce0a82218c Mon Sep 17 00:00:00 2001 From: Thomas Gazagnaire Date: Wed, 8 Aug 2018 17:24:01 +0200 Subject: [PATCH 3/4] ocaml-base-compiler.4.00.1: Fix patch checksum --- packages/ocaml-base-compiler/ocaml-base-compiler.4.00.1/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ocaml-base-compiler/ocaml-base-compiler.4.00.1/opam b/packages/ocaml-base-compiler/ocaml-base-compiler.4.00.1/opam index 496e0c9cce0a..1101497ceb40 100644 --- a/packages/ocaml-base-compiler/ocaml-base-compiler.4.00.1/opam +++ b/packages/ocaml-base-compiler/ocaml-base-compiler.4.00.1/opam @@ -24,5 +24,5 @@ url { extra-source "bd7fa181cb64742c3b6cbb8ee13436554eb18cd7...fix-clang-build.diff" { src: "https://github.com/diml/ocaml/compare/bd7fa181cb64742c3b6cbb8ee13436554eb18cd7...fix-clang-build.diff" - checksum: "md5=a8c6dd8e547a7b766138f7ca3eb1cbfd" + checksum: "md5=faccda3b3ab092fa9ac7d5d4d8beb004" } From 4c559c319fb4fc0aa92c07e4518b0e2684e92e85 Mon Sep 17 00:00:00 2001 From: Thomas Gazagnaire Date: Wed, 8 Aug 2018 18:04:34 +0200 Subject: [PATCH 4/4] Do not try to build compiler packages --- .travis-ci.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis-ci.sh b/.travis-ci.sh index 6fb093a90fb8..775c0dd9d657 100755 --- a/.travis-ci.sh +++ b/.travis-ci.sh @@ -105,7 +105,11 @@ opam --version opam --git-version for i in `cat tobuild.txt`; do - build_one $i + name=$(echo $i | cut -f1 -d".") + case $name in + ocaml|ocaml-base-compiler) ;; + *) build_one $i + esac done kill $PING_LOOP_PID