From 817d2157e64ad0ff903639e74e08f68d6680140a Mon Sep 17 00:00:00 2001 From: Mathieu Barbin Date: Tue, 8 Sep 2026 12:44:05 +0200 Subject: [PATCH] Upgrade CI --- .github/workflows/ci.yml | 18 +++++++++++++----- .github/workflows/deploy-doc.yml | 13 +++++++++++-- .github/workflows/more-ci.yml | 12 ++++++++++-- .github/workflows/test-deploy-doc.yml | 13 +++++++++++-- dune-workspace.4.14 | 2 +- dune-workspace.5.5 | 2 +- 6 files changed, 47 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0c97faf..bdf1d15 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,15 +23,23 @@ jobs: runs-on: ${{ matrix.os }} + # Keep Git maintenance in the foreground to avoid a race in opam 2.5. + # See https://github.com/ocaml/opam/issues/7031. + env: + GIT_CONFIG_COUNT: "2" + GIT_CONFIG_KEY_0: gc.autoDetach + GIT_CONFIG_VALUE_0: "false" + GIT_CONFIG_KEY_1: maintenance.autoDetach + GIT_CONFIG_VALUE_1: "false" + steps: - name: Checkout code uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - name: Setup OCaml - uses: ocaml/setup-ocaml@dec6499fef64fc5d7ed43d43a87251b7b1c306f5 # v3.4.8 + uses: ocaml/setup-ocaml@e89b2ded52a6e13f50162220cf5fe47290162032 # v3.8.0 with: ocaml-compiler: "${{ matrix.ocaml-compiler }}" - dune-cache: true opam-repositories: | default: https://github.com/ocaml/opam-repository.git mbarbin: https://github.com/mbarbin/opam-repository.git @@ -73,10 +81,10 @@ jobs: run: git diff --exit-code - name: Lint opam - uses: ocaml/setup-ocaml/lint-opam@dec6499fef64fc5d7ed43d43a87251b7b1c306f5 # v3.4.8 + uses: ocaml/setup-ocaml/lint-opam@e89b2ded52a6e13f50162220cf5fe47290162032 # v3.8.0 - name: Lint fmt - uses: ocaml/setup-ocaml/lint-fmt@dec6499fef64fc5d7ed43d43a87251b7b1c306f5 # v3.4.8 + uses: ocaml/setup-ocaml/lint-fmt@e89b2ded52a6e13f50162220cf5fe47290162032 # v3.8.0 - name: Lint doc - uses: ocaml/setup-ocaml/lint-doc@dec6499fef64fc5d7ed43d43a87251b7b1c306f5 # v3.4.8 + uses: ocaml/setup-ocaml/lint-doc@e89b2ded52a6e13f50162220cf5fe47290162032 # v3.8.0 diff --git a/.github/workflows/deploy-doc.yml b/.github/workflows/deploy-doc.yml index d9ccc74..45259d1 100644 --- a/.github/workflows/deploy-doc.yml +++ b/.github/workflows/deploy-doc.yml @@ -14,6 +14,16 @@ jobs: build: name: Build Docusaurus runs-on: ubuntu-latest + + # Keep Git maintenance in the foreground to avoid a race in opam 2.5. + # See https://github.com/ocaml/opam/issues/7031. + env: + GIT_CONFIG_COUNT: "2" + GIT_CONFIG_KEY_0: gc.autoDetach + GIT_CONFIG_VALUE_0: "false" + GIT_CONFIG_KEY_1: maintenance.autoDetach + GIT_CONFIG_VALUE_1: "false" + defaults: run: shell: bash @@ -35,10 +45,9 @@ jobs: run: npm ci --ignore-scripts - name: Setup OCaml - uses: ocaml/setup-ocaml@dec6499fef64fc5d7ed43d43a87251b7b1c306f5 # v3.4.8 + uses: ocaml/setup-ocaml@e89b2ded52a6e13f50162220cf5fe47290162032 # v3.8.0 with: ocaml-compiler: "5.3.x" - dune-cache: true opam-repositories: | default: https://github.com/ocaml/opam-repository.git mbarbin: https://github.com/mbarbin/opam-repository.git diff --git a/.github/workflows/more-ci.yml b/.github/workflows/more-ci.yml index 266e843..6bb1786 100644 --- a/.github/workflows/more-ci.yml +++ b/.github/workflows/more-ci.yml @@ -44,6 +44,15 @@ jobs: runs-on: ${{ matrix.os }} + # Keep Git maintenance in the foreground to avoid a race in opam 2.5. + # See https://github.com/ocaml/opam/issues/7031. + env: + GIT_CONFIG_COUNT: "2" + GIT_CONFIG_KEY_0: gc.autoDetach + GIT_CONFIG_VALUE_0: "false" + GIT_CONFIG_KEY_1: maintenance.autoDetach + GIT_CONFIG_VALUE_1: "false" + defaults: run: shell: bash @@ -53,10 +62,9 @@ jobs: uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - name: Setup OCaml - uses: ocaml/setup-ocaml@dec6499fef64fc5d7ed43d43a87251b7b1c306f5 # v3.4.8 + uses: ocaml/setup-ocaml@e89b2ded52a6e13f50162220cf5fe47290162032 # v3.8.0 with: ocaml-compiler: "${{ matrix.ocaml-compiler }}" - dune-cache: true opam-repositories: | default: https://github.com/ocaml/opam-repository.git mbarbin: https://github.com/mbarbin/opam-repository.git diff --git a/.github/workflows/test-deploy-doc.yml b/.github/workflows/test-deploy-doc.yml index 15a939a..9866b5b 100644 --- a/.github/workflows/test-deploy-doc.yml +++ b/.github/workflows/test-deploy-doc.yml @@ -14,6 +14,16 @@ jobs: test-deploy: name: Test deployment runs-on: ubuntu-latest + + # Keep Git maintenance in the foreground to avoid a race in opam 2.5. + # See https://github.com/ocaml/opam/issues/7031. + env: + GIT_CONFIG_COUNT: "2" + GIT_CONFIG_KEY_0: gc.autoDetach + GIT_CONFIG_VALUE_0: "false" + GIT_CONFIG_KEY_1: maintenance.autoDetach + GIT_CONFIG_VALUE_1: "false" + defaults: run: shell: bash @@ -35,10 +45,9 @@ jobs: run: npm ci --ignore-scripts - name: Setup OCaml - uses: ocaml/setup-ocaml@dec6499fef64fc5d7ed43d43a87251b7b1c306f5 # v3.4.8 + uses: ocaml/setup-ocaml@e89b2ded52a6e13f50162220cf5fe47290162032 # v3.8.0 with: ocaml-compiler: "5.3.x" - dune-cache: true opam-repositories: | default: https://github.com/ocaml/opam-repository.git mbarbin: https://github.com/mbarbin/opam-repository.git diff --git a/dune-workspace.4.14 b/dune-workspace.4.14 index 4e5ee43..67164d2 100644 --- a/dune-workspace.4.14 +++ b/dune-workspace.4.14 @@ -6,7 +6,7 @@ (repositories overlay upstream mbarbin) (constraints (ocaml - (= 4.14.3)))) + (= 4.14.4)))) (repository (name mbarbin) diff --git a/dune-workspace.5.5 b/dune-workspace.5.5 index ac8292f..46fb2dd 100644 --- a/dune-workspace.5.5 +++ b/dune-workspace.5.5 @@ -6,7 +6,7 @@ (repositories overlay upstream alpha mbarbin) (constraints (ocaml - (= 5.5.0)))) + (= 5.5.1)))) (repository (name mbarbin)