Merge pull request #270 from shubhamkumar13/dev/update-to-5.00.0+domains

Update to 5.00.0+domains

.drone.yml

@@ -24,14 +24,14 @@ steps:
 
 ---
 kind: pipeline
-name: 4.14.0+domains+serial
+name: 5.00.0+domains+serial
 
 platform:
   os: linux
   arch: amd64
 
 steps:
-- name: 4.14.0+domains+serial
+- name: 5.00.0+domains+serial
   image: ocaml/opam:ubuntu-20.04-ocaml-4.12
   commands:
   - sudo apt-get update && sudo apt-get -y install wget pkg-config libgmp-dev m4 libdw-dev jq python3-pip
@@ -43,20 +43,20 @@ steps:
   - export ITER=1
   - export OPAM_DISABLE_SANDBOXING=true
   - TAG='"run_in_ci"' make run_config_filtered.json
-  - RUN_CONFIG_JSON=run_config_filtered.json make ocaml-versions/4.14.0+domains.bench
+  - RUN_CONFIG_JSON=run_config_filtered.json make ocaml-versions/5.00.0+domains.bench
   - ls _results
   - cat _results/*
 
 ---
 kind: pipeline
-name: 4.14.0+domains+parallel
+name: 5.00.0+domains+parallel
 
 platform:
   os: linux
   arch: amd64
 
 steps:
-- name: 4.14.0+domains+parallel
+- name: 5.00.0+domains+parallel
   image: ocaml/opam:ubuntu-20.04-ocaml-4.12
   commands:
   - sudo apt-get update && sudo apt-get -y install wget pkg-config libgmp-dev m4 libdw-dev jq python3-pip
@@ -70,7 +70,7 @@ steps:
   - TAG='"run_in_ci"' make multicore_parallel_run_config_filtered.json
   - TAG='"macro_bench"' make multicore_parallel_run_config_filtered_filtered.json
   - make multicore_parallel_run_config_filtered_filtered_2domains.json
-  - BUILD_BENCH_TARGET=multibench_parallel RUN_CONFIG_JSON=multicore_parallel_run_config_filtered_filtered_2domains.json make ocaml-versions/4.14.0+domains.bench
+  - BUILD_BENCH_TARGET=multibench_parallel RUN_CONFIG_JSON=multicore_parallel_run_config_filtered_filtered_2domains.json make ocaml-versions/5.00.0+domains.bench
   - ls _results
   - cat _results/*
 

Makefile

@@ -31,7 +31,7 @@ WRAPPER = $(patsubst run_%,%,$(RUN_BENCH_TARGET))
 PACKAGES = \
 	cpdf conf-pkg-config conf-zlib bigstringaf decompress camlzip menhirLib \
 	menhir minilight base dune-private-libs dune-configurator camlimages \
-	yojson lwt zarith uuidm react ocplib-endian nbcodec checkseum \
+	yojson lwt zarith uuidm react ocplib-endian nbcodec checkseum ppxlib \
 	sexplib0 eventlog-tools cubicle conf-findutils logs \
 	mtime  repr 
 
@@ -88,11 +88,13 @@ _opam/%: _opam/opam-init/init.sh ocaml-versions/%.json setup_sys_dune
 	$(eval OCAML_RUN_PARAM     = $(shell jq -r '.runparams // empty' ocaml-versions/$*.json))
 	opam update
 	OCAMLRUNPARAM="$(OCAML_RUN_PARAM)" OCAMLCONFIGOPTION="$(OCAML_CONFIG_OPTION)" opam switch create --keep-build-dir --yes $* ocaml-base-compiler.$*
+	opam pin add -n --yes --switch $* base.v0.15.0 https://github.com/janestreet/base.git#v0.15.0
 	opam pin add -n --yes --switch $* eventlog-tools https://github.com/ocaml-multicore/eventlog-tools.git#multicore
-	opam pin add -n --yes --switch $* orun orun/
-	opam pin add -n --yes --switch $* rungen rungen/
+	opam pin add -n --yes --switch $* sexplib0.v0.15.0 https://github.com/shubhamkumar13/sexplib0.git#multicore
 	opam pin add -n --yes --switch $* coq-core https://github.com/ejgallego/coq/archive/refs/tags/multicore-2021-09-29.tar.gz
 	opam pin add -n --yes --switch $* coq-stdlib https://github.com/ejgallego/coq/archive/refs/tags/multicore-2021-09-29.tar.gz
+	opam pin add -n --yes --switch $* orun orun/
+	opam pin add -n --yes --switch $* rungen rungen/
 
 .PHONY: .FORCE
 .FORCE:
@@ -108,12 +110,11 @@ blah:
 ocaml-versions/%.bench: check_url depend log_sandmark_hash ocaml-versions/%.json _opam/% .FORCE
 	$(eval ENVIRONMENT = $(shell jq -r '.wrappers[] | select(.name=="$(WRAPPER)") | .environment // empty' "$(RUN_CONFIG_JSON)" ))
 	@opam update
-	opam install --switch=$* --keep-build-dir --yes rungen orun coq-core coq-stdlib coq fraplib
+	opam install --switch=$* --keep-build-dir --yes rungen orun 
 	@# case statement to select the correct variant for omp and ppxlib
 	@{ case "$*" in \
-		*domains*) opam install --switch=$* --keep-build-dir --yes stdio integers ocaml-migrate-parsetree.2.2.0+stock ppxlib.0.22.0+stock  ppx_deriving ppx_deriving_yojson irmin ppx_irmin ppx_repr irmin-layers irmin-pack index ;; \
-		*5.00*) sed 's/(alias (name buildbench) (deps layers.exe irmin_mem_rw.exe))/; (alias (name buildbench) (deps layers.exe irmin_mem_rw.exe))/g' ./benchmarks/irmin/dune > ./benchmarks/irmin/dune ;; \
-		*) opam install --switch=$* --keep-build-dir --yes stdio integers  ocaml-migrate-parsetree.2.2.0+stock ppxlib.0.22.0+stock js_of_ocaml-compiler coq fraplib ppx_deriving ppx_deriving_yojson irmin ppx_irmin ppx_repr irmin-layers irmin-pack index ;; \
+		*5.00*) sed 's/(alias (name buildbench) (deps layers.exe irmin_mem_rw.exe))/; (alias (name buildbench) (deps layers.exe irmin_mem_rw.exe))/g' ./benchmarks/irmin/dune > ./benchmarks/irmin/dune; echo "5.00" ;; \
+		*) opam install --switch=$* --keep-build-dir --yes stdio integers js_of_ocaml-compiler coq-core coq-stdlib coq fraplib ;; \
 	esac }; \
 	opam install --switch=$* --best-effort --keep-build-dir --yes $(PACKAGES) || $(CONTINUE_ON_OPAM_INSTALL_ERROR)
 	opam exec --switch $* -- opam list

dependencies/packages/fmt/fmt.0.9.0/opam

@@ -0,0 +1,36 @@
+opam-version: "2.0"
+synopsis: """OCaml Format pretty-printer combinators"""
+maintainer: ["Daniel Bünzli <daniel.buenzl i@erratique.ch>"]
+authors: ["The fmt programmers"]
+homepage: "https://erratique.ch/software/fmt"
+doc: "https://erratique.ch/software/fmt/doc/"
+dev-repo: "git+https://erratique.ch/repos/fmt.git"
+bug-reports: "https://github.com/dbuenzli/fmt/issues"
+license: ["ISC"]
+tags: ["string" "format" "pretty-print" "org:erratique"]
+depends: ["ocaml" {>= "4.08.0"}
+          "ocamlfind" {build}
+          "ocamlbuild" {build}
+          "topkg" {build & >= "1.0.3"}]
+depopts: ["base-unix"
+          "cmdliner"]
+conflicts: ["cmdliner" {< "0.9.8"}]
+build: [["ocaml" "pkg/pkg.ml" "build" "--dev-pkg" "%{dev}%"
+          "--with-base-unix" "%{base-unix:installed}%"
+          "--with-cmdliner" "%{cmdliner:installed}%"]]
+url {
+  src: "https://erratique.ch/software/fmt/releases/fmt-0.9.0.tbz"
+  checksum: "sha512=66cf4b8bb92232a091dfda5e94d1c178486a358cdc34b1eec516d48ea5acb6209c0dfcb416f0c516c50ddbddb3c94549a45e4a6d5c5fd1c81d3374dec823a83b"}
+description: """
+Fmt exposes combinators to devise `Format` pretty-printing functions.
+
+Fmt depends only on the OCaml standard library. The optional `Fmt_tty`
+library that allows to setup formatters for terminal color output
+depends on the Unix library. The optional `Fmt_cli` library that
+provides command line support for Fmt depends on [`Cmdliner`][cmdliner].
+
+Fmt is distributed under the ISC license.
+
+[cmdliner]: http://erratique.ch/software/cmdliner
+
+Home page: http://erratique.ch/software/fmt"""