From a42c36272c152134cfda446ae378f2a5a311347c Mon Sep 17 00:00:00 2001 From: Rob Hoes Date: Thu, 16 Oct 2025 15:25:25 +0100 Subject: [PATCH 1/2] More missing unix dependencies Signed-off-by: Rob Hoes --- ocaml/libs/xapi-stdext/lib/xapi-stdext-encodings/bench/dune | 2 +- ocaml/tests/bench/dune | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ocaml/libs/xapi-stdext/lib/xapi-stdext-encodings/bench/dune b/ocaml/libs/xapi-stdext/lib/xapi-stdext-encodings/bench/dune index 9f12bcbf8ce..b51703690dc 100644 --- a/ocaml/libs/xapi-stdext/lib/xapi-stdext-encodings/bench/dune +++ b/ocaml/libs/xapi-stdext/lib/xapi-stdext-encodings/bench/dune @@ -2,5 +2,5 @@ (name bench_encodings) (modes exe) (optional) - (libraries bechamel xapi_stdext_encodings bechamel-notty notty.unix fmt) + (libraries unix bechamel xapi_stdext_encodings bechamel-notty notty.unix fmt) ) diff --git a/ocaml/tests/bench/dune b/ocaml/tests/bench/dune index fe0af458c14..a61bafa186c 100644 --- a/ocaml/tests/bench/dune +++ b/ocaml/tests/bench/dune @@ -25,6 +25,7 @@ xapi_aux tests_common log + unix xapi_database xapi_datamodel xapi_internal From c610a4e5780ee6998ecb3722c55c7a1ef3ae76f7 Mon Sep 17 00:00:00 2001 From: Rob Hoes Date: Thu, 16 Oct 2025 15:41:27 +0100 Subject: [PATCH 2/2] CI: Add OCaml 5.3 as experimental build Signed-off-by: Rob Hoes --- .github/workflows/codechecker.yml | 1 + .github/workflows/generate-and-build-sdks.yml | 1 + .github/workflows/main.yml | 6 ++++++ .github/workflows/setup-xapi-environment/action.yml | 5 ++++- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codechecker.yml b/.github/workflows/codechecker.yml index 8908822a16e..bb3a9fa4304 100644 --- a/.github/workflows/codechecker.yml +++ b/.github/workflows/codechecker.yml @@ -31,6 +31,7 @@ jobs: uses: ./.github/workflows/setup-xapi-environment with: xapi_version: ${{ env.XAPI_VERSION }} + ocaml_version: "4.14.2" - name: Install dune-compiledb to generate compile_commands.json run: | diff --git a/.github/workflows/generate-and-build-sdks.yml b/.github/workflows/generate-and-build-sdks.yml index 46e2457aed7..1c9ec9dd7f4 100644 --- a/.github/workflows/generate-and-build-sdks.yml +++ b/.github/workflows/generate-and-build-sdks.yml @@ -24,6 +24,7 @@ jobs: uses: ./.github/workflows/setup-xapi-environment with: xapi_version: ${{ inputs.xapi_version }} + ocaml_version: "4.14.2" - name: Generate SDKs shell: bash diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e4971839e16..a22f85dc72f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,9 +25,14 @@ jobs: fail-fast: false matrix: runs-on: ["ubuntu-22.04"] + ocaml-version: ["4.14.2"] experimental: [false] include: - runs-on: "ubuntu-22.04-arm" + ocaml-version: "4.14.2" + experimental: true + - runs-on: "ubuntu-22.04" + ocaml-version: "5.3.0" experimental: true continue-on-error: ${{ matrix.experimental }} @@ -48,6 +53,7 @@ jobs: uses: ./.github/workflows/setup-xapi-environment with: xapi_version: ${{ env.XAPI_VERSION }} + ocaml_version: ${{ matrix.ocaml-version }} - name: Build run: opam exec -- make diff --git a/.github/workflows/setup-xapi-environment/action.yml b/.github/workflows/setup-xapi-environment/action.yml index c3126a6d157..aba9e881219 100644 --- a/.github/workflows/setup-xapi-environment/action.yml +++ b/.github/workflows/setup-xapi-environment/action.yml @@ -5,6 +5,9 @@ inputs: xapi_version: description: "XenAPI version, pass to configure as --xapi_version=" required: true + ocaml_version: + description: "OCaml compiler version" + required: true runs: using: "composite" steps: @@ -52,7 +55,7 @@ runs: - name: Use ocaml uses: ocaml/setup-ocaml@v3 with: - ocaml-compiler: ${{ steps.dotenv.outputs.ocaml_version_full }} + ocaml-compiler: ${{ inputs.ocaml_version }} opam-repositories: | xs-opam: ${{ steps.dotenv.outputs.repository }} dune-cache: true