Update CI to OCaml 4.13

ocaml · Dec 13, 2021 · 419d832 · 419d832
1 parent e47c448
commit 419d832
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -43,7 +43,7 @@ env:
   OPAM_TEST_REPO_SHA: ec07d6d5f363d1c5b9ed3b927d0df1d58dad333c
   OPAM_REPO_SHA: ec07d6d5f363d1c5b9ed3b927d0df1d58dad333c
   # Default ocaml version for some jobs
-  OCAML_VERSION: 4.12.0
+  OCAML_VERSION: 4.13.1
   ## variables for cache paths
   GH_OCAML_CACHE: ~/.cache/ocaml-local/**
   SOLVER:
@@ -108,10 +108,10 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        ocamlv: [ 4.08.1, 4.09.1, 4.10.2, 4.11.2, 4.12.0 ]
+        ocamlv: [ 4.08.1, 4.09.1, 4.10.2, 4.11.2, 4.12.1, 4.13.1 ]
         include:
           - os: macos-latest
-            ocamlv: 4.12.0
+            ocamlv: 4.13.1
       # Intentionally fail fast, no need to run all build if there is a
       # problem in a given version; usually it is functions not defined in lower
       # versions of OCaml
@@ -180,7 +180,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, macos-latest ]
-        ocamlv: [ 4.12.0 ]
+        ocamlv: [ 4.13.1 ]
       fail-fast: false
     env:
       OPAM_TEST: 1
@@ -232,7 +232,7 @@ jobs:
       matrix:
 #        os: [ ubuntu-latest, macos-latest ]
         os: [ ubuntu-latest ]
-        ocamlv: [ 4.12.0 ]
+        ocamlv: [ 4.13.1 ]
       fail-fast: false
     steps:
     - name: install deps
@@ -262,7 +262,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, macos-latest ]
-        ocamlv: [ 4.12.0 ]
+        ocamlv: [ 4.13.1 ]
         solver: [ z3, 0install ]
       fail-fast: false
     env:
@@ -311,7 +311,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, macos-latest ]
-        ocamlv: [ 4.12.0 ]
+        ocamlv: [ 4.13.1 ]
       fail-fast: false
     steps:
     - name: install deps

diff --git a/appveyor_test.sh b/appveyor_test.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-opam init -y -a --compiler=ocaml.4.12.0 git+$OPAM_REPO#$OPAM_TEST_REPO_SHA
+opam init -y -a --compiler=ocaml.4.13.1 git+$OPAM_REPO#$OPAM_TEST_REPO_SHA
 eval $(opam config env)
 opam install -y -v ocamlfind
diff --git a/release/Dockerfile.in b/release/Dockerfile.in
@@ -7,15 +7,15 @@ RUN apk add gcc g++ make coreutils openssl
 
 RUN addgroup -S opam && adduser -S opam -G opam -s /bin/sh
 
-ADD https://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0.tar.gz /root/
+ADD https://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.1.tar.gz /root/
 
 WORKDIR /root
-RUN tar xzf ocaml-4.12.0.tar.gz
-WORKDIR ocaml-4.12.0
+RUN tar xzf ocaml-4.13.1.tar.gz
+WORKDIR ocaml-4.13.1
 RUN sed -i 's/gnueabi/*eabi/' configure
 RUN sed -i 's/musl/musl*/' configure
 RUN ./configure %CONF% -prefix /usr/local
-RUN make world opt.opt && make install && rm -rf /root/ocaml-4.12.0 /root/ocaml-4.12.0.tar.gz
+RUN make world opt.opt && make install && rm -rf /root/ocaml-4.13.1 /root/ocaml-4.13.1.tar.gz
 
 RUN apk add patch
 

diff --git a/release/Makefile b/release/Makefile
@@ -7,7 +7,7 @@ FULL_ARCHIVE_URL = https://github.com/ocaml/opam/releases/download/$(VERSION)/op
 
 TARGETS = x86_64-linux i686-linux armhf-linux arm64-linux
 
-OCAMLV = 4.12.0
+OCAMLV = 4.13.1
 # currently hardcoded in Dockerfile.in
 OCAML_URL = https://caml.inria.fr/pub/distrib/ocaml-$(basename $(OCAMLV))/ocaml-$(OCAMLV).tar.gz