diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3dffd9099..33db45095 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ on: permissions: {} env: - OCAML_DEFAULT_VERSION: 4.14.3 + OCAML_DEFAULT_VERSION: "4.14" # Add OPAMYES=true to the environment, this is usefill to replace `-y` option # in any opam call OPAMYES: true @@ -27,16 +27,9 @@ jobs: - ubuntu-latest - windows-latest ocaml-compiler: - - 4.11.2 - - 4.14.3 - - 5.4.0 - exclude: - # OCaml 4.11.2 is not available on macOS + arm - - os: macos-latest - ocaml-compiler: 4.11.2 - # Opam 2.2 requires at least OCaml 4.13 - - os: windows-latest - ocaml-compiler: 4.11.2 + - "4.13.1" + - "4.14" + - "5.5" runs-on: ${{ matrix.os }} diff --git a/.github/workflows/build_js.yml b/.github/workflows/build_js.yml index 4a6a5c0be..8380b0054 100644 --- a/.github/workflows/build_js.yml +++ b/.github/workflows/build_js.yml @@ -5,7 +5,7 @@ name: Build Javascript on: [push,pull_request] env: - OCAML_DEFAULT_VERSION: 4.14.3 + OCAML_DEFAULT_VERSION: "4.14" # Add OPAMYES=true to the environment, this is usefull to replace `-y` option # in any opam call OPAMYES: true @@ -60,7 +60,7 @@ jobs: # Use Node Js actions - uses: actions/setup-node@v4 with: - node-version: '14' + node-version: '16.9.0' # Run simple test with node # TODO: use gentest to run more tests there. diff --git a/.github/workflows/build_static.yml b/.github/workflows/build_static.yml index 94a8fba40..300d3a4c5 100644 --- a/.github/workflows/build_static.yml +++ b/.github/workflows/build_static.yml @@ -39,7 +39,7 @@ jobs: - uses: ocaml/setup-ocaml@v3 with: - ocaml-compiler: 4.14.3 + ocaml-compiler: "4.14" dune-cache: true - name: Update opam repository diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index f2df5237c..0008231c4 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -18,7 +18,7 @@ on: pull_request: env: - OCAML_DEFAULT_VERSION: 4.14.3 + OCAML_DEFAULT_VERSION: "4.14" # Add OPAMYES=true to the environment, this is usefill to replace `-y` option # in any opam call OPAMYES: true diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index ab0cdecf6..9a3c7dcef 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -3,7 +3,7 @@ name: Linter on: [push,pull_request] env: - OCAML_DEFAULT_VERSION: 4.14.3 + OCAML_DEFAULT_VERSION: "4.14" # Add OPAMYES=true to the environment, this is usefill to replace `-y` option # in any opam call OPAMYES: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1d61f6c26..03490bc55 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,7 @@ on: workflow_dispatch env: - OCAML_DEFAULT_VERSION: 4.14.3 + OCAML_DEFAULT_VERSION: "4.14" OPAMYES: true OPAMLOCKED: locked diff --git a/alt-ergo-js.opam b/alt-ergo-js.opam index e38a83c4f..96806e2e5 100644 --- a/alt-ergo-js.opam +++ b/alt-ergo-js.opam @@ -11,7 +11,7 @@ depends: [ "dune" {>= "3.14"} "alt-ergo" {= version} "alt-ergo-lib" {= version} - "js_of_ocaml" {>= "6.0.0" & <= "6.2.0"} + "js_of_ocaml" {>= "6.4.0"} "js_of_ocaml-lwt" "js_of_ocaml-ppx" "data-encoding" diff --git a/alt-ergo-lib.opam.locked b/alt-ergo-lib.opam.locked index 8cabfc383..e84e938d6 100644 --- a/alt-ergo-lib.opam.locked +++ b/alt-ergo-lib.opam.locked @@ -1,3 +1,4 @@ + opam-version: "2.0" name: "alt-ergo-lib" version: "dev" @@ -17,45 +18,36 @@ doc: "https://ocamlpro.github.io/alt-ergo" bug-reports: "https://github.com/OCamlPro/alt-ergo/issues" depends: [ "base-bigarray" {= "base"} - "base-bytes" {= "base"} "base-threads" {= "base"} "base-unix" {= "base"} "camlzip" {= "1.14"} - "cmdliner" {= "2.1.0"} + "cmdliner" {= "2.1.1"} "conf-gmp" {= "5"} - "conf-pkg-config" {= "4"} + "conf-pkg-config" {= "5"} "conf-zlib" {= "1"} - "cppo" {= "1.8.0"} - "crunch" {= "4.0.0"} + "crunch" {= "4.1.0"} "csexp" {= "1.5.2"} "dolmen" {= "dev"} "dolmen_loop" {= "dev"} "dolmen_type" {= "dev"} - "dune" {= "3.22.0"} - "dune-build-info" {= "3.22.0"} - "dune-configurator" {= "3.22.0"} - "dune-private-libs" {= "3.22.0"} - "dune-site" {= "3.22.0"} - "dyn" {= "3.22.0"} + "dune" {= "3.24.2"} + "dune-build-info" {= "3.24.2"} + "dune-private-libs" {= "3.24.2"} + "dune-site" {= "3.24.2"} + "dyn" {= "3.24.2"} "fmt" {= "0.11.0"} - "fs-io" {= "3.22.0"} + "fs-io" {= "3.24.2"} "gen" {= "1.1"} "hmap" {= "0.8.1"} - "js_of_ocaml-compiler" {= "6.2.0"} "logs" {= "0.10.0"} - "lwt" {= "5.9.2"} "menhir" {= "20260209"} "menhirCST" {= "20260209"} "menhirGLR" {= "20260209"} "menhirLib" {= "20260209"} "menhirSdk" {= "20260209"} - "ocaml-compiler-libs" {= "v0.12.4"} - "ocaml-options-vanilla" {= "1"} "ocamlbuild" {= "0.16.1"} - "ocamlfind" {= "1.9.8"} - "ocplib-endian" {= "1.2"} "ocplib-simplex" {= "0.5.1"} - "ordering" {= "3.22.0"} + "ordering" {= "3.24.2"} "ounit2" {= "2.2.7" & with-test} "pp" {= "2.0.0"} "pp_loc" {= "2.1.0"} @@ -63,18 +55,18 @@ depends: [ "qcheck" {= "0.25" & with-test} "qcheck-core" {= "0.25" & with-test} "qcheck-ounit" {= "0.25" & with-test} - "sedlex" {= "3.7"} "seq" {= "base"} - "sexplib0" {= "v0.16.0"} "spelll" {= "0.4"} "stdlib-shims" {= "0.3.0"} - "stdune" {= "3.22.0"} - "top-closure" {= "3.22.0"} + "stdune" {= "3.24.2"} + "top-closure" {= "3.24.2"} "topkg" {= "1.1.1"} "uutf" {= "1.0.4"} - "yojson" {= "2.2.2"} "zarith" {= "1.14"} ] +conflicts: [ + "result" {< "1.5"} +] build: [ ["dune" "subst"] {dev} [ @@ -92,9 +84,6 @@ build: [ ["dune" "install" "-p" name "--create-install-files" name] ] dev-repo: "git+https://github.com/OCamlPro/alt-ergo.git" -conflicts: [ - "result" {< "1.5"} -] pin-depends: [ [ "dolmen.dev" diff --git a/docs/sphinx_docs/Javascript/index.md b/docs/sphinx_docs/Javascript/index.md index 83ebfa10a..b66c9475b 100644 --- a/docs/sphinx_docs/Javascript/index.md +++ b/docs/sphinx_docs/Javascript/index.md @@ -66,6 +66,7 @@ To install the `Alt-Ergo` JavaScript artifacts, simply install the `alt-ergo-js` opam package. The artifacts will be available in `SHARE/alt-ergo-js`, where `SHARE` refers to the share directory of your current opam switch. +The JavaScript artifacts require at least NodeJS 16.9.0. To execute Alt-Ergo JavaScript, use the following command: ```console node SHARE/alt-ergo-js/alt-ergo.js diff --git a/dune-project b/dune-project index 6b6371d70..b07e9e8f6 100644 --- a/dune-project +++ b/dune-project @@ -46,7 +46,7 @@ See more details on https://alt-ergo.ocamlpro.com/") (depends (alt-ergo (= :version)) (alt-ergo-lib (= :version)) - (js_of_ocaml (and (>= 6.0.0) (<= 6.2.0))) + (js_of_ocaml (>= 6.4.0)) js_of_ocaml-lwt js_of_ocaml-ppx data-encoding