Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/codechecker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/generate-and-build-sdks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/setup-xapi-environment/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ inputs:
xapi_version:
description: "XenAPI version, pass to configure as --xapi_version=<value>"
required: true
ocaml_version:
description: "OCaml compiler version"
required: true
runs:
using: "composite"
steps:
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)
1 change: 1 addition & 0 deletions ocaml/tests/bench/dune
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
xapi_aux
tests_common
log
unix
xapi_database
xapi_datamodel
xapi_internal
Expand Down
Loading