travis/appveyor: set fixed commit hash for test and one for compiling…

… opam

.travis-ci.sh

@@ -418,7 +418,7 @@ fi
     # The SHA is fixed so that upstream changes shouldn't affect CI. The SHA needs
     # to be moved forwards when a new version of OCaml is added to ensure that the
     # ocaml-system package is available at the correct version.
-    opam init --bare default git+https://github.com/ocaml/opam-repository#$OPAM_REPO_SHA
+    opam init --bare default git+https://github.com/ocaml/opam-repository#$OPAM_TEST_REPO_SHA
     opam switch create default ocaml-system
     eval $(opam env)
     opam install lwt

.travis.yml

@@ -29,7 +29,8 @@ env:
   global:
   - OPAMBSVERSION=2.1.0-alpha2
     # This should be identical to the value in appveyor.yml
-  - OPAM_REPO_SHA=6877131f0
+  - OPAM_REPO_SHA=88c17a663
+  - OPAM_TEST_REPO_SHA=6877131f0
 
 jobs:
   include:

appveyor.yml

@@ -12,7 +12,8 @@ environment:
     CYG_MIRROR: http://mirrors.kernel.org/sourceware/cygwin/
     DEP_MODE: lib-ext
     # This should be identical to the value in .travis.yml
-    OPAM_REPO_SHA: 6877131f0
+    OPAM_REPO_SHA: 88c17a663
+    OPAM_TEST_REPO_SHA: 6877131f0
   matrix:
     - CYG_ROOT: cygwin
       CYG_ARCH: x86

appveyor_test.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-opam init -y -a --compiler=ocaml.4.11.1 git+https://github.com/ocaml/opam-repository#$OPAM_REPO_SHA
+opam init -y -a --compiler=ocaml.4.11.1 git+https://github.com/ocaml/opam-repository#$OPAM_TEST_REPO_SHA
 eval $(opam config env)
 opam install -y -v ocamlfind