Skip to content

Commit 539a08b

Browse files
authored
CI: Add OCaml 5.3 as experimental build (#6714)
2 parents 8c49449 + c610a4e commit 539a08b

File tree

6 files changed

+14
-2
lines changed

6 files changed

+14
-2
lines changed

.github/workflows/codechecker.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
uses: ./.github/workflows/setup-xapi-environment
3232
with:
3333
xapi_version: ${{ env.XAPI_VERSION }}
34+
ocaml_version: "4.14.2"
3435

3536
- name: Install dune-compiledb to generate compile_commands.json
3637
run: |

.github/workflows/generate-and-build-sdks.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
uses: ./.github/workflows/setup-xapi-environment
2525
with:
2626
xapi_version: ${{ inputs.xapi_version }}
27+
ocaml_version: "4.14.2"
2728

2829
- name: Generate SDKs
2930
shell: bash

.github/workflows/main.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,14 @@ jobs:
2525
fail-fast: false
2626
matrix:
2727
runs-on: ["ubuntu-22.04"]
28+
ocaml-version: ["4.14.2"]
2829
experimental: [false]
2930
include:
3031
- runs-on: "ubuntu-22.04-arm"
32+
ocaml-version: "4.14.2"
33+
experimental: true
34+
- runs-on: "ubuntu-22.04"
35+
ocaml-version: "5.3.0"
3136
experimental: true
3237

3338
continue-on-error: ${{ matrix.experimental }}
@@ -48,6 +53,7 @@ jobs:
4853
uses: ./.github/workflows/setup-xapi-environment
4954
with:
5055
xapi_version: ${{ env.XAPI_VERSION }}
56+
ocaml_version: ${{ matrix.ocaml-version }}
5157

5258
- name: Build
5359
run: opam exec -- make

.github/workflows/setup-xapi-environment/action.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ inputs:
55
xapi_version:
66
description: "XenAPI version, pass to configure as --xapi_version=<value>"
77
required: true
8+
ocaml_version:
9+
description: "OCaml compiler version"
10+
required: true
811
runs:
912
using: "composite"
1013
steps:
@@ -52,7 +55,7 @@ runs:
5255
- name: Use ocaml
5356
uses: ocaml/setup-ocaml@v3
5457
with:
55-
ocaml-compiler: ${{ steps.dotenv.outputs.ocaml_version_full }}
58+
ocaml-compiler: ${{ inputs.ocaml_version }}
5659
opam-repositories: |
5760
xs-opam: ${{ steps.dotenv.outputs.repository }}
5861
dune-cache: true

ocaml/libs/xapi-stdext/lib/xapi-stdext-encodings/bench/dune

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
(name bench_encodings)
33
(modes exe)
44
(optional)
5-
(libraries bechamel xapi_stdext_encodings bechamel-notty notty.unix fmt)
5+
(libraries unix bechamel xapi_stdext_encodings bechamel-notty notty.unix fmt)
66
)

ocaml/tests/bench/dune

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
xapi_aux
2626
tests_common
2727
log
28+
unix
2829
xapi_database
2930
xapi_datamodel
3031
xapi_internal

0 commit comments

Comments
 (0)