OCaml trunk has been updated to 5.4

punchagan · Aug 27, 2024 · 20b939e · 20b939e
1 parent 3500bd2
commit 20b939e
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 10 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,7 +10,7 @@ on:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  build-5-3:
+  build-5-4:
     strategy:
       matrix:
         os:
@@ -39,19 +39,19 @@ jobs:
           sudo apt-get update && make install-depends
 
       # Runs a set of commands using the runners shell
-      - name: 5.3.0+trunk+serial
+      - name: 5.4.0+trunk+serial
         run: |
           eval $(opam env)
           export ITER=1
           export OPAM_DISABLE_SANDBOXING=true
           TAG='"run_in_ci"' make run_config_filtered.json
           sed -i 's/--cpu-list 5/--cpu-list 1/g' run_config_filtered.json
-          OPT_WAIT=0 USE_SYS_DUNE_HACK=1 RUN_CONFIG_JSON=run_config_filtered.json make ocaml-versions/5.3.0+trunk.bench
+          OPT_WAIT=0 USE_SYS_DUNE_HACK=1 RUN_CONFIG_JSON=run_config_filtered.json make ocaml-versions/5.4.0+trunk.bench
           ls _results
           cat _results/*
           make json
 
-      - name: 5.3.0+trunk+parallel
+      - name: 5.4.0+trunk+parallel
         run: |
           eval $(opam env)
           export ITER=1
@@ -61,7 +61,7 @@ jobs:
           sed -i 's/--cpu-list 5/--cpu-list 1/g' multicore_parallel_run_config_filtered.json
           sed -i 's/--cpu-list 5/--cpu-list 1/g' multicore_parallel_run_config_filtered_filtered.json
           make multicore_parallel_run_config_filtered_filtered_2domains.json
-          OPT_WAIT=0 USE_SYS_DUNE_HACK=1 BUILD_BENCH_TARGET=multibench_parallel RUN_CONFIG_JSON=multicore_parallel_run_config_filtered_filtered_2domains.json make ocaml-versions/5.3.0+trunk.bench
+          OPT_WAIT=0 USE_SYS_DUNE_HACK=1 BUILD_BENCH_TARGET=multibench_parallel RUN_CONFIG_JSON=multicore_parallel_run_config_filtered_filtered_2domains.json make ocaml-versions/5.4.0+trunk.bench
           ls _results
           cat _results/*
           make json
@@ -95,19 +95,19 @@ jobs:
           sudo apt-get update && make install-depends
 
       # Runs a set of commands using the runners shell
-      - name: 5.2.1+trunk+serial
+      - name: 5.3.0+trunk+serial
         run: |
           eval $(opam env)
           export ITER=1
           export OPAM_DISABLE_SANDBOXING=true
           TAG='"run_in_ci"' make run_config_filtered.json
           sed -i 's/--cpu-list 5/--cpu-list 1/g' run_config_filtered.json
-          OPT_WAIT=0 USE_SYS_DUNE_HACK=1 RUN_CONFIG_JSON=run_config_filtered.json make ocaml-versions/5.2.1+trunk.bench
+          OPT_WAIT=0 USE_SYS_DUNE_HACK=1 RUN_CONFIG_JSON=run_config_filtered.json make ocaml-versions/5.3.0+trunk.bench
           ls _results
           cat _results/*
           make json
 
-      - name: 5.2.1+trunk+parallel
+      - name: 5.3.0+trunk+parallel
         run: |
           eval $(opam env)
           export ITER=1
@@ -117,7 +117,7 @@ jobs:
           sed -i 's/--cpu-list 5/--cpu-list 1/g' multicore_parallel_run_config_filtered.json
           sed -i 's/--cpu-list 5/--cpu-list 1/g' multicore_parallel_run_config_filtered_filtered.json
           make multicore_parallel_run_config_filtered_filtered_2domains.json
-          OPT_WAIT=0 USE_SYS_DUNE_HACK=1 BUILD_BENCH_TARGET=multibench_parallel RUN_CONFIG_JSON=multicore_parallel_run_config_filtered_filtered_2domains.json make ocaml-versions/5.2.1+trunk.bench
+          OPT_WAIT=0 USE_SYS_DUNE_HACK=1 BUILD_BENCH_TARGET=multibench_parallel RUN_CONFIG_JSON=multicore_parallel_run_config_filtered_filtered_2domains.json make ocaml-versions/5.3.0+trunk.bench
           ls _results
           cat _results/*
           make json

diff --git a/ocaml-versions/5.3.0+trunk.json b/ocaml-versions/5.3.0+trunk.json
@@ -1,5 +1,5 @@
 {
-  "url" : "https://github.com/ocaml/ocaml/archive/trunk.tar.gz",
+  "url" : "https://github.com/ocaml/ocaml/archive/refs/heads/5.3.zip",
   "package_overrides": [
     "fmt.0.9.0",
     "ocamlfind.1.9.3.git"

diff --git a/ocaml-versions/5.4.0+trunk.json b/ocaml-versions/5.4.0+trunk.json
@@ -0,0 +1,30 @@
+{
+  "url" : "https://github.com/ocaml/ocaml/archive/trunk.tar.gz",
+  "package_overrides": [
+    "fmt.0.9.0",
+    "ocamlfind.1.9.3.git"
+  ],
+  "package_remove": [
+    "camlpdf",
+    "cpdf",
+    "coq",
+    "coq-core",
+    "coq-stdlib",
+    "ctypes",
+    "fraplib",
+    "index",
+    "integers",
+    "irmin",
+    "irmin-layers",
+    "irmin-pack",
+    "js_of_ocaml-compiler",
+    "ocaml-migrate-parsetree",
+    "ppx_derivers",
+    "ppx_deriving",
+    "ppx_deriving_yojson",
+    "ppx_irmin",
+    "ppxlib",
+    "ppx_repr",
+    "stdio"
+  ]
+}