diff --git a/.github/workflows/js_of_ocaml.yml b/.github/workflows/js_of_ocaml.yml index 19c8c76af1..755efb1980 100644 --- a/.github/workflows/js_of_ocaml.yml +++ b/.github/workflows/js_of_ocaml.yml @@ -59,7 +59,7 @@ jobs: skip-doc: true - os: ubuntu-latest os-name: Ubuntu - ocaml-compiler: "5.3" + ocaml-compiler: "ocaml-base-compiler.5.4.0~beta2" skip-effects: false skip-test: false skip-doc: false @@ -72,31 +72,24 @@ jobs: # Note this OCaml compiler is bytecode only - os: ubuntu-latest os-name: Ubuntu - ocaml-name: "5.3.0+32bit" - ocaml-compiler: "ocaml-variants.5.3.0+options,ocaml-option-32bit" + ocaml-name: "5.4.0~beta2+32bit" + ocaml-compiler: "ocaml-variants.5.4.0~beta2+options,ocaml-option-32bit" skip-effects: true # disabled for the same reason than `skip-test` skip-test: true # the `time_now.0.17` package is pulled and doesn't work in 32 bits :( skip-doc: true - os: macos-latest os-name: MacOS - ocaml-compiler: "5.3" + ocaml-compiler: "ocaml-base-compiler.5.4.0~beta2" skip-effects: true skip-test: false skip-doc: true - os: windows-latest os-name: Windows - ocaml-compiler: "5.3" + ocaml-compiler: "ocaml-base-compiler.5.4.0~beta2" skip-effects: false skip-test: false skip-doc: true - - os: ubuntu-latest - os-name: Ubuntu - ocaml-name: "5.4-alpha1" - ocaml-compiler: "ocaml-compiler.5.4.0~alpha1" - skip-effects: true - skip-test: true - skip-doc: true - + runs-on: ${{ matrix.os }} name: diff --git a/.github/workflows/wasm_of_ocaml.yml b/.github/workflows/wasm_of_ocaml.yml index c964c54c30..032b54414e 100644 --- a/.github/workflows/wasm_of_ocaml.yml +++ b/.github/workflows/wasm_of_ocaml.yml @@ -35,26 +35,26 @@ jobs: include: - os: macos-latest os-name: MacOS - ocaml-compiler: "5.3" + ocaml-compiler: "ocaml-base-compiler.5.4.0~beta2" separate_compilation: true jane_street_tests: false all_jane_street_tests: false - os: windows-latest os-name: Windows - ocaml-compiler: "5.3" + ocaml-compiler: "ocaml-base-compiler.5.4.0~beta2" separate_compilation: true # Jane Street tests disabled for now (basement only works on Linux) jane_street_tests: false all_jane_street_tests: false - os: ubuntu-latest os-name: Ubuntu - ocaml-compiler: "5.3" + ocaml-compiler: "ocaml-base-compiler.5.4.0~beta2" separate_compilation: true jane_street_tests: true all_jane_street_tests: true - os: ubuntu-latest os-name: Ubuntu - ocaml-compiler: "5.3" + ocaml-compiler: "ocaml-base-compiler.5.4.0~beta2" separate_compilation: false jane_street_tests: true all_jane_street_tests: false @@ -123,7 +123,7 @@ jobs: run: | opam repo add js janestreet/opam-repository opam install opam-format - opam pin add ppxlib -n 0.35.0 + opam pin add ppxlib -n 0.37.0~5.4preview opam exec -- dune exec --root wasm_of_ocaml tools/ci_setup.exe - name: Pin Jane Street packages diff --git a/compiler/tests-ocaml/lib-list/test.ml b/compiler/tests-ocaml/lib-list/test.ml index 227c454775..6f56e35365 100644 --- a/compiler/tests-ocaml/lib-list/test.ml +++ b/compiler/tests-ocaml/lib-list/test.ml @@ -68,13 +68,13 @@ let () = assert (List.take 3 [1; 2; 3; 4; 5] = [1; 2; 3]); assert (List.take 3 [1; 2] = [1; 2]); assert (List.take 3 [] = []); - assert ((try List.take (-1) [1; 2] with Invalid_argument _ -> [999]) = [999]); + assert (List.take (-1) [1; 2] = []); assert (List.take 0 [1; 2] = []); assert (List.drop 6 hello_world = world); assert (List.drop 3 [1; 2; 3; 4; 5] = [4; 5]); assert (List.drop 3 [1; 2] = []); assert (List.drop 3 [] = []); - assert ((try List.drop (-1) [1; 2] with Invalid_argument _ -> [999]) = [999]); + assert (List.drop (-1) [1; 2] = [1; 2]); assert (List.drop 0 [1; 2] = [1; 2]); assert (List.take_while (fun x -> x < 3) [1; 2; 3; 4; 1; 2; 3; 4] = [1; 2]); diff --git a/compiler/tests-toplevel/test_toplevel.expected b/compiler/tests-toplevel/test_toplevel.expected index 81e85b3449..c6e778709b 100644 --- a/compiler/tests-toplevel/test_toplevel.expected +++ b/compiler/tests-toplevel/test_toplevel.expected @@ -2,6 +2,6 @@ hello - : int = 2 Line 4, characters 2-4: Error: Syntax error -Line 5, characters 0-16: -Error: Unbound module "Missing_module" +Line 5, characters 0-14: +Error: Unbound module Missing_module val y : float = 0.333333333333333315 diff --git a/dune-project b/dune-project index 676fe82cb9..f9c0ca4ec2 100644 --- a/dune-project +++ b/dune-project @@ -20,7 +20,7 @@ (ocaml (and (>= 4.13) (< 5.5))) (num :with-test) (ppx_expect (and (>= v0.16.1) :with-test)) - (ppxlib (>= 0.35)) + (ppxlib (>= 0.37.0~5.4preview)) (re :with-test) (cmdliner (>= 1.1.0)) (sedlex (>= 3.3)) @@ -62,7 +62,7 @@ (depends (ocaml (>= 4.13)) (js_of_ocaml (= :version)) - (ppxlib (>= 0.35)) + (ppxlib (>= 0.37.0~5.4preview)) (num :with-test) (ppx_expect (and (>= v0.14.2) :with-test)) (re (and (>= 1.9.0) :with-test)) @@ -76,7 +76,7 @@ (depends (ocaml (>= 4.13)) (js_of_ocaml (= :version)) - (ppxlib (>= 0.35)) + (ppxlib (>= 0.37.0~5.4preview)) (num :with-test) (ppx_expect (and (>= v0.14.2) :with-test)) (re (and (>= 1.9.0) :with-test)) @@ -95,7 +95,7 @@ (graphics :with-test) (num :with-test) (ppx_expect (and (>= v0.14.2) :with-test)) - (ppxlib (>= 0.35)) + (ppxlib (>= 0.37.0~5.4preview)) (re (and (>= 1.9.0) :with-test)) )) @@ -126,7 +126,7 @@ (js_of_ocaml-compiler (= :version)) (num :with-test) (ppx_expect (and (>= v0.14.2) :with-test)) - (ppxlib (>= 0.35)) + (ppxlib (>= 0.37.0~5.4preview)) (re (and (>= 1.9.0) :with-test)) )) @@ -140,7 +140,7 @@ (js_of_ocaml (= :version)) (num :with-test) (ppx_expect (and (>= v0.14.2) :with-test)) - (ppxlib (>= 0.35)) + (ppxlib (>= 0.37.0~5.4preview)) (re :with-test) (cmdliner (>= 1.1.0)) (opam-format :with-test)