Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OCaml trunk has been updated to 5.4 #476

Merged
merged 1 commit into from
Aug 27, 2024
Merged

OCaml trunk has been updated to 5.4 #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -61,12 +61,12 @@ 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

build-5-2:
build-5-3:
strategy:
matrix:
os:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ocaml-versions/5.3.0+trunk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
30 changes: 30 additions & 0 deletions ocaml-versions/5.4.0+trunk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
]
}
Loading