From c9e3de21b92e8e41767f111d0c1c2875f80f623a Mon Sep 17 00:00:00 2001 From: Kate Date: Thu, 5 Sep 2024 16:41:17 +0100 Subject: [PATCH 1/2] Add support for OCaml 5.3 when using certain C++ compilers --- src/context_flags.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/context_flags.ml b/src/context_flags.ml index 814a3da..2bc7f49 100644 --- a/src/context_flags.ml +++ b/src/context_flags.ml @@ -23,7 +23,7 @@ let cxxflags = let flags = (if (Sys.win32 && Config.ccomp_type = "msvc") then ["\"/EHsc\""] - else ["-Wall -Wextra -Wno-unused-parameter -x c++"]) @ + else ["-Wall -Wextra -Wno-unused-parameter -x c++ -std=gnu++11"]) @ (ifc useGLPK ["-DUSEGLPK"]) @ (ifc useCOIN ["-DUSECOIN"]) @ (ifc useCLP ["-DUSECLP"]) @ From 1158ddf423765fd5c397195e7f2f9303cea2254b Mon Sep 17 00:00:00 2001 From: Kate Date: Thu, 9 Jan 2025 00:04:16 +0000 Subject: [PATCH 2/2] GHA: upgrade to setup-ocaml@v3, add OCaml 5.1, 5.2 and 5.3, and remove 4.12 and 4.13 to the test matrix --- .github/workflows/main.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 44ab1ea..874ac30 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,15 +14,11 @@ jobs: - macos-latest - windows-latest ocaml-compiler: - - 4.12.x - - 4.13.x - - 4.14.x - - 5.00.x - exclude: - - os: windows-latest - ocaml-compiler: 5.00.x - - os: macos-latest - ocaml-compiler: 4.08.x + - "4.14" + - "5.0" + - "5.1" + - "5.2" + - "5.3" runs-on: ${{ matrix.os }} @@ -31,7 +27,7 @@ jobs: uses: actions/checkout@v3 - name: Use OCaml ${{ matrix.ocaml-compiler }} - uses: ocaml/setup-ocaml@v2 + uses: ocaml/setup-ocaml@v3 with: ocaml-compiler: ${{ matrix.ocaml-compiler }}