Merge pull request #408 from AltGr/ocaml-412-port

Port to OCaml 4.12

Author: erikmd

.ci-macosx.sh

@@ -6,7 +6,7 @@ brew update
 brew install pkg-config
 brew install opam
 brew install libev
-opam init -y --compiler=4.05.0
+opam init -y --compiler=4.12.0
 eval $(opam env)
 
 opam install -y -j 2 . --deps-only --locked

.github/workflows/static-builds.yml

@@ -46,20 +46,16 @@ jobs:
           sw_vers
           system_profiler SPSoftwareDataType
           uname -a
-      # Need unreleased 2.1.0~rc
-      # - name: Retrieve opam
-      #   run: |
-      #     mkdir "$HOME/bin"
-      #     wget https://github.com/ocaml/opam/releases/download/2.1.0-beta2/opam-2.1.0-beta2-x86_64-macos -O $HOME/bin/opam
-      #     chmod a+x $HOME/bin/opam
-      #     echo "$HOME/bin" >> $GITHUB_PATH
-      - name: Install latest opam
+      - name: Retrieve opam
         run: |
-          brew install opam --HEAD
+          mkdir "$HOME/bin"
+          wget https://github.com/ocaml/opam/releases/download/2.1.0/opam-2.1.0-x86_64-macos -O $HOME/bin/opam
+          chmod a+x $HOME/bin/opam
+          echo "$HOME/bin" >> $GITHUB_PATH
       - name: Prepare build environment
         run: |
           opam init -a --bare
-          opam switch create . ocaml-base-compiler 'dune<2' --deps-only
+          opam switch create . ocaml-base-compiler --deps-only
       - name: Build the binaries
         run: |
           opam exec -- make LINKING_MODE=static

.gitignore

@@ -6,14 +6,10 @@ _opam
 .opam-switch
 Makefile.local
 docker/
-src/ppx-metaquot/ast_lifter.ml
 
 learnocaml-server.byte
 learn-ocaml.install
 
-src/grader/embedded_cmis.ml
-src/grader/embedded_grading_cmis.ml
-
 demo-repository/exercises/*.stderr
 demo-repository/exercises/*.stdout
 demo-repository/exercises/*.outcomes

Dockerfile

@@ -1,15 +1,15 @@
-FROM ocaml/opam:alpine-3.13-ocaml-4.05 as compilation
+FROM ocaml/opam:alpine-3.13-ocaml-4.12 as compilation
 LABEL Description="learn-ocaml building" Vendor="OCamlPro"
 
-WORKDIR learn-ocaml
+WORKDIR /home/opam/learn-ocaml
 
-COPY learn-ocaml.opam learn-ocaml.opam.locked learn-ocaml-client.opam ./
+COPY learn-ocaml.opam learn-ocaml.opam.locked learn-ocaml-client.opam learn-ocaml-client.opam.locked ./
 RUN sudo chown -R opam:nogroup .
 
 ENV OPAMYES true
 RUN echo 'archive-mirrors: [ "https://opam.ocaml.org/cache" ]' >> ~/.opam/config \
   && opam repository set-url default http://opam.ocaml.org \
-  && opam switch 4.05 \
+  && opam switch 4.12 \
   && echo 'pre-session-commands: [ "sudo" "apk" "add" depexts ]' >> ~/.opam/config \
   && opam install . --deps-only --locked
 
@@ -42,7 +42,7 @@ WORKDIR /learnocaml
 
 COPY --from=compilation /home/opam/install-prefix/bin/learn-ocaml-client /usr/bin
 
-ENTRYPOINT ["dumb-init","learn-ocaml-client"]
+ENTRYPOINT ["dumb-init","/usr/bin/learn-ocaml-client"]
 
 LABEL org.opencontainers.image.title="learn-ocaml-client"
 LABEL org.opencontainers.image.description="learn-ocaml command-line client"
@@ -68,7 +68,7 @@ WORKDIR /home/learn-ocaml
 
 COPY --from=compilation /home/opam/install-prefix /usr
 
-ENTRYPOINT ["dumb-init","learn-ocaml","--sync-dir=/sync","--repo=/repository"]
+ENTRYPOINT ["dumb-init","/usr/bin/learn-ocaml","--sync-dir=/sync","--repo=/repository"]
 CMD ["build","serve"]
 
 LABEL org.opencontainers.image.title="learn-ocaml"

Dockerfile.test-client

@@ -1,7 +1,7 @@
 # This Dockerfile is useful for testing purposes
 # to ensure learn-ocaml-client can be built alone from learn-ocaml-client.opam
 
-FROM ocaml/opam:alpine-3.13-ocaml-4.05 as compilation
+FROM ocaml/opam:alpine-3.13-ocaml-4.12 as compilation
 LABEL Description="learn-ocaml building" Vendor="OCamlPro"
 
 WORKDIR learn-ocaml
@@ -13,7 +13,7 @@ RUN sudo chown -R opam:nogroup .
 ENV OPAMYES true
 RUN echo 'archive-mirrors: [ "https://opam.ocaml.org/cache" ]' >> ~/.opam/config \
   && opam repository set-url default http://opam.ocaml.org \
-  && opam switch 4.05 \
+  && opam switch 4.12 \
   && echo 'pre-session-commands: [ "sudo" "apk" "add" depexts ]' >> ~/.opam/config \
   && opam pin add -n -y -k path learn-ocaml-client . \
   && opam install learn-ocaml-client --deps-only

Makefile

@@ -57,7 +57,7 @@ testrun: build install
 	learn-ocaml build --repo $(REPO) -j1
 	rm -rf www/css
 	ln -s ../static/css www
-	learn-ocaml serve
+	LEARNOCAML_SERVER_NOCACHE=1 learn-ocaml serve
 
 docker-images: Dockerfile learn-ocaml.opam
 	@rm -rf docker
@@ -95,7 +95,7 @@ travis: # From https://stackoverflow.com/questions/21053657/how-to-run-travis-ci
 static-binaries:
 	./scripts/static-build.sh
 
-BINARIES = src/main/learnocaml_client.bc src/main/learnocaml_main.bc src/main/learnocaml_server_main.exe
+BINARIES = src/main/learnocaml_client.bc.exe src/main/learnocaml_main.bc.exe src/main/learnocaml_server_main.exe
 
 .PHONY: detect-libs
 detect-libs:
@@ -104,6 +104,7 @@ detect-libs:
 	baseid="detect-libs.$$$$"; echo ...; \
 	$(MAKE) LINKING_MODE=dynamic OCAMLPARAM="_,verbose=1" > $$baseid.log 2>&1; \
 	for bin in $(BINARIES); do \
+	  rm -f "_build/default/$$bin"; \
 	  base=$${bin#src/main/}; base=$${base%.*}; \
 	  grep -e "'$$bin'" $$baseid.log > $$baseid.$$base.log; \
 	  printf "%s: " "$$base"; \

docs/tutorials/step-7.md

@@ -36,7 +36,7 @@ exception OutOfRange of int
 For the first graded function, we want to be sure the student function
 returned both the right `Ok` output and the right exception with its
 is correct argument. The predefined tester that compares both possible
-results with `Pervasives.compare` function is called `test`. This is
+results with `Stdlib.compare` function is called `test`. This is
 obviously the default value of optional argument [~test].
 
 ```ocaml
@@ -198,7 +198,7 @@ let p_list l =
   let t = List.fold_left (fun a x -> a && p x) true l in
   if t then
 	(* Check that there is at least two different elements *)
-	let l = List.sort_uniq (Pervasives.compare) l in
+	let l = List.sort_uniq (Stdlib.compare) l in
 	if List.length l > 1 then true else false
   else false
 

dune

@@ -7,7 +7,7 @@
 )
 
 (env
-  (release (flags -safe-string -w +a-4-42-44-45-48-3)
+  (release (flags -safe-string -w +a-4-42-44-45-48-3-58)
            (ocamlc_flags)
            (ocamlopt_flags))
 )

dune-project

@@ -1,3 +1,4 @@
-(lang dune 1.7)
+(lang dune 2.3)
 (name learn-ocaml)
 (version 0.12)
+(allow_approximate_merlin)

learn-ocaml-client.opam

@@ -21,24 +21,24 @@ depends: [
   "asak"
   "gg"
   "vg"
-  "cohttp" {>= "1.0.0" & < "2.0.0"}
-  "cohttp-lwt-unix" {>= "1.0.0" & < "2.0.0"}
+  "cohttp" {>= "2.0.0"}
+  "cohttp-lwt-unix" {>= "2.0.0"}
   "ssl" {= "0.5.5"}
   "digestif" {>= "0.7.1"}
-  "dune" {>= "1.11.4" & <= "2.0.1"}
+  "dune"
   "ezjsonm"
   "lwt" {>= "4.0.0"}
   "lwt_ssl"
-  "ocaml" {= "4.05.0"}
+  "ocaml" {= "4.12.0"}
   "ocamlfind" {build}
   "ocp-indent-nlfork"
   "ocp-ocamlres" {>= "0.4"}
-  "ocplib-json-typed" {= "0.6"}
+  "ocplib-json-typed" {>= "0.7"}
   "ipaddr" {= "2.8.0" }
   "cstruct" {>= "3.3.0"}
   "ppx_tools"
-  "ppx_sexp_conv" {= "v0.9.0"}
-  "ppx_fields_conv" {= "v0.9.0"}
+  "ppx_sexp_conv"
+  "ppx_fields_conv"
 ]
 build: [
   ["dune" "build" "@install" "-p" name "-j" jobs]