add OCaml 5.0.0 compatibility

.github/workflows/ocaml-general.yml

@@ -20,6 +20,7 @@ jobs:
       matrix:
         ocaml-version:
           - 4.13.1
+          - 5.0.0
         arch:
           - amd64
           # - arm64 # it's taking too long for the purpose of validation
@@ -36,6 +37,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Set up env var
+        run: echo "PACKAGE_INSTALL_SCRIPT_FILENAME=install_ocaml_$(eval cut -d'.' -f1 <<< ${{ matrix.ocaml-version }})_packages.sh" >> $GITHUB_ENV
+
       - name: Set up QEMU for arm64
         uses: docker/setup-qemu-action@v2
         with:
@@ -64,6 +68,7 @@ jobs:
           build-args: |
             NODE_VERSION=${{ matrix.node-version }}
             OCAML_VERSION=${{ matrix.ocaml-version }}
+            PACKAGE_INSTALL_SCRIPT_FILENAME=${{ env.PACKAGE_INSTALL_SCRIPT_FILENAME }}
           cache-from: type=local,src=${{ env.CACHE_DIR }}/.buildx-cache
           cache-to: type=local,dest=${{ env.CACHE_DIR }}/.buildx-cache-new,mode=max
 
@@ -81,8 +86,7 @@ jobs:
           - 4.12.1
           - 4.13.1
           - 4.14.1
-          # OCaml 5.x is not supported yet
-          # - 5.0.0
+          - 5.0.0
         arch:
           - amd64
           - arm64
@@ -104,6 +108,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Set up env var
+        run: echo "PACKAGE_INSTALL_SCRIPT_FILENAME=install_ocaml_$(eval cut -d'.' -f1 <<< ${{ matrix.ocaml-version }})_packages.sh" >> $GITHUB_ENV
+
       - name: Set up QEMU for arm64
         uses: docker/setup-qemu-action@v2
         with:
@@ -139,6 +146,7 @@ jobs:
           build-args: |
             NODE_VERSION=${{ matrix.node-version }}
             OCAML_VERSION=${{ matrix.ocaml-version }}
+            PACKAGE_INSTALL_SCRIPT_FILENAME=${{ env.PACKAGE_INSTALL_SCRIPT_FILENAME }}
           tags: "ghcr.io/kxcteam/ocaml-general:${{ env.DOCKER_TAG }},ghcr.io/kxcteam/ocaml-general:${{ env.DOCKER_TAG }}-${{ github.sha }}"
           cache-from: type=local,src=${{ env.CACHE_DIR }}/.buildx-cache
           cache-to: type=local,dest=${{ env.CACHE_DIR }}/.buildx-cache-new,mode=max
@@ -153,6 +161,7 @@ jobs:
           build-args: |
             NODE_VERSION=${{ matrix.node-version }}
             OCAML_VERSION=${{ matrix.ocaml-version }}
+            PACKAGE_INSTALL_SCRIPT_FILENAME=${{ env.PACKAGE_INSTALL_SCRIPT_FILENAME }}
           tags: "ghcr.io/kxcteam/ocaml-general:${{ matrix.ocaml-version }},ghcr.io/kxcteam/ocaml-general:${{ matrix.ocaml-version }}-${{ github.sha }}"
           cache-from: type=local,src=${{ env.CACHE_DIR }}/.buildx-cache-new
 

ocaml-general/Dockerfile

@@ -25,29 +25,11 @@ RUN apt-get update && apt-get install -y \
   opam
 
 ARG OCAML_VERSION=4.13.1
+ARG PACKAGE_INSTALL_SCRIPT_FILENAME=install_ocaml_4_packages.sh
 RUN opam init --auto-setup --yes --bare --disable-sandboxing
 RUN opam switch create $OCAML_VERSION
-RUN opam install --yes \
-  dune.3.4.0 \
-  merlin \
-  odoc.2.2.0 \
-  ppxlib.0.26.0 \
-  ppx_deriving.5.2.1 \
-  js_of_ocaml.4.1.0 js_of_ocaml-ppx.4.1.0 js_of_ocaml-ppx.4.1.0 \
-  sexplib.v0.15.0 ppx_sexp_conv.v0.15.1 \
-  yojson.1.7.0 ppx_yojson_conv.v0.15.0 \
-  jsonm.1.0.1 \
-  ppx_optcomp.v0.15.0 \
-  brr.0.0.4 \
-  prr.0.1.1 \
-  zed.3.2.0 \
-  tezt.3.0.0 \
-  ocamlformat.0.24.1 \
-  ppx_inline_test.v0.15.0 \
-  alcotest.1.6.0 \
-  qcheck.0.19.1 \
-  qcheck-alcotest.0.19.1 \
-  && opam clean -y --logs --repo-cache --download-cache --switch-cleanup
+COPY $PACKAGE_INSTALL_SCRIPT_FILENAME /tmp/install_packages.sh
+RUN /tmp/install_packages.sh && rm /tmp/install_packages.sh
 
 ENV DEBIAN_FRONTEND=$DEBIAN_FRONTEND_OLD
 ENV OPAMROOT=/root/.opam

ocaml-general/install_ocaml_4_packages.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+opam install --yes \
+  dune.3.4.0 \
+  merlin \
+  odoc.2.2.0 \
+  ppxlib.0.26.0 \
+  ppx_deriving.5.2.1 \
+  js_of_ocaml.4.1.0 js_of_ocaml-ppx.4.1.0 js_of_ocaml-lwt.4.1.0 \
+  sexplib.v0.15.0 ppx_sexp_conv.v0.15.1 \
+  yojson.1.7.0 ppx_yojson_conv.v0.15.0 \
+  jsonm.1.0.1 \
+  ppx_optcomp.v0.15.0 \
+  brr.0.0.4 \
+  prr.0.1.1 \
+  zed.3.2.0 \
+  tezt.3.0.0 \
+  ocamlformat.0.24.1 \
+  ppx_inline_test.v0.15.0 \
+  alcotest.1.6.0 \
+  qcheck.0.19.1 \
+  qcheck-alcotest.0.19.1 \
+  && opam clean -y --logs --repo-cache --download-cache --switch-cleanup

ocaml-general/install_ocaml_5_packages.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+opam install --yes \
+  dune.3.4.0 \
+  merlin \
+  odoc.2.2.0 \
+  ppxlib.0.28.0 \
+  ppx_deriving.5.2.1 \
+  js_of_ocaml.4.1.0 js_of_ocaml-ppx.4.1.0 js_of_ocaml-lwt.4.1.0 \
+  sexplib.v0.15.1 ppx_sexp_conv.v0.15.1 \
+  yojson.2.0.2 ppx_yojson_conv.v0.15.1 \
+  jsonm.1.0.1 \
+  ezjsonm.1.3.0 \
+  ppx_optcomp.v0.15.0 \
+  brr.0.0.4 \
+  prr.0.1.1 \
+  zed.3.2.0 \
+  tezt.3.0.0 \
+  ppx_inline_test.v0.15.0 \
+  alcotest.1.6.0 \
+  qcheck.0.20 \
+  qcheck-alcotest.0.20 \
+  && opam clean -y --logs --repo-cache --download-cache --switch-cleanup