Skip to content

Commit 6195cc8

Browse files
mbarbinmbarbin
committed
Upgrade CIs
1 parent c4dcd16 commit 6195cc8

File tree

11 files changed

+56
-38
lines changed

11 files changed

+56
-38
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,40 +13,38 @@ permissions:
1313

1414
jobs:
1515
build:
16-
strategy:
17-
fail-fast: false
18-
matrix:
19-
os:
20-
- ubuntu-latest
21-
ocaml-version:
22-
- "5.4"
23-
24-
runs-on: ${{ matrix.os }}
25-
16+
name: CI
17+
runs-on: ubuntu-latest
18+
env:
19+
OCAML_VERSION: "5.4"
20+
DUNE_VERSION: "3.22.0"
21+
DUNE_DIGEST: "sha256:33ca9308b48d9f5e90ee34f5b1045b53df6b5780a188556dab72af53621b5fba"
2622
defaults:
2723
run:
2824
shell: bash
29-
3025
steps:
3126
- name: Checkout code
3227
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3328

3429
- name: Setup mdexp
3530
uses: mbarbin/mdexp-actions/setup-mdexp@42da13e622de9559da363ef5906ffde63a982efd # v1.0.0-alpha.1
3631
with:
37-
mdexp-version: 0.0.20260315
38-
mdexp-digest: sha256:f4fc53bcaa50c9dd979b968804c38322b9b7e6aa699d9d6d2d1f101965332018
32+
mdexp-version: "0.0.20260315"
33+
mdexp-digest: "sha256:f4fc53bcaa50c9dd979b968804c38322b9b7e6aa699d9d6d2d1f101965332018"
3934

4035
- name: Environment setup
4136
run: |
42-
echo "DUNE_WORKSPACE=$PWD/dune-workspace-${{ matrix.ocaml-version }}" >> "$GITHUB_ENV"
37+
echo "DUNE_WORKSPACE=$PWD/dune-workspace.${{ env.OCAML_VERSION }}" >> "$GITHUB_ENV"
4338
4439
- name: Setup Dune
45-
uses: mbarbin/setup-dune@ae2985bcdedc6fb24e5743d6f9dace9cf262b41c # v2.0.0+patch-4
40+
uses: mbarbin/setup-dune@03ede0220d3fe665f250727d8e21b7c0f9517f3b # v2.0.0+patch-7
41+
env:
42+
GH_TOKEN: ${{ github.token }}
4643
with:
47-
version: "3.21.0"
48-
workspace: ${{ env.DUNE_WORKSPACE }}
49-
cache-prefix: "main-ci-${{ matrix.ocaml-version }}"
44+
version: "${{ env.DUNE_VERSION }}"
45+
dune-digest: "${{ env.DUNE_DIGEST }}"
46+
workspace: "${{ env.DUNE_WORKSPACE }}"
47+
cache-prefix: "main-ci-${{ env.OCAML_VERSION }}"
5048
cache-readonly: ${{ github.ref != 'refs/heads/main' }}
5149
steps: install-dune enable-pkg lazy-update-depexts install-gpatch install-depexts
5250

‎.github/workflows/crs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
- name: Install crs
2020
uses: mbarbin/crs-actions/setup-crs@1496bc422fe27b357d6354ab494e922f6a2b061f # v1.0.0-alpha.13
2121
with:
22-
crs-version: 0.0.20260307
23-
crs-digest: sha256:5097e709386d8d41351a87f86c8ad374db72aabe4ddc2a8ff2d58faebb1b889f
22+
crs-version: "0.0.20260307"
23+
crs-digest: "sha256:5097e709386d8d41351a87f86c8ad374db72aabe4ddc2a8ff2d58faebb1b889f"
2424

2525
- name: Summarize CRs in PR
2626
uses: mbarbin/crs-actions/summarize-crs-in-pr@1496bc422fe27b357d6354ab494e922f6a2b061f # v1.0.0-alpha.13

‎.github/workflows/deploy-doc.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ jobs:
1616
runs-on: ubuntu-latest
1717
env:
1818
OCAML_VERSION: "5.4"
19+
DUNE_VERSION: "3.22.0"
20+
DUNE_DIGEST: "sha256:33ca9308b48d9f5e90ee34f5b1045b53df6b5780a188556dab72af53621b5fba"
1921
defaults:
2022
run:
2123
shell: bash
@@ -38,13 +40,16 @@ jobs:
3840

3941
- name: Environment setup
4042
run: |
41-
echo "DUNE_WORKSPACE=$PWD/dune-workspace-${{ env.OCAML_VERSION }}" >> "$GITHUB_ENV"
43+
echo "DUNE_WORKSPACE=$PWD/dune-workspace.${{ env.OCAML_VERSION }}" >> "$GITHUB_ENV"
4244
4345
- name: Setup Dune
44-
uses: mbarbin/setup-dune@ae2985bcdedc6fb24e5743d6f9dace9cf262b41c # v2.0.0+patch-4
46+
uses: mbarbin/setup-dune@03ede0220d3fe665f250727d8e21b7c0f9517f3b # v2.0.0+patch-7
47+
env:
48+
GH_TOKEN: ${{ github.token }}
4549
with:
46-
version: "3.21.0"
47-
workspace: ${{ env.DUNE_WORKSPACE }}
50+
version: "${{ env.DUNE_VERSION }}"
51+
dune-digest: "${{ env.DUNE_DIGEST }}"
52+
workspace: "${{ env.DUNE_WORKSPACE }}"
4853
cache-prefix: "main-ci-${{ env.OCAML_VERSION }}"
4954
cache-readonly: true
5055
steps: install-dune enable-pkg lazy-update-depexts install-gpatch install-depexts
@@ -62,7 +67,7 @@ jobs:
6267
run: npm run build
6368

6469
- name: Upload Build Artifact
65-
uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4.0.0
70+
uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 # v5.0.0
6671
with:
6772
path: doc/build
6873

‎.github/workflows/dune-pkg-more-ci.yml‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@ jobs:
2929
- "5.3"
3030
- "5.2"
3131
- "4.14"
32+
include:
33+
- os: ubuntu-latest
34+
dune-version: "3.22.0"
35+
dune-digest: "sha256:33ca9308b48d9f5e90ee34f5b1045b53df6b5780a188556dab72af53621b5fba"
36+
- os: macos-latest
37+
dune-version: "3.22.0"
38+
dune-digest: "sha256:66aa2c005b1c5c60daf711aee0630cc988b6038aa86ca807879e281145f232cb"
3239
exclude:
3340
# Exclude the combination already tested in the main ci workflow.
3441
- os: ubuntu-latest
@@ -46,19 +53,22 @@ jobs:
4653

4754
- name: Environment setup
4855
run: |
49-
echo "DUNE_WORKSPACE=$PWD/dune-workspace-${{ matrix.ocaml-version }}" >> "$GITHUB_ENV"
56+
echo "DUNE_WORKSPACE=$PWD/dune-workspace.${{ matrix.ocaml-version }}" >> "$GITHUB_ENV"
5057
if [ "${{ matrix.ocaml-version }}" = "4.14" ]; then
5158
echo "PACKAGES=volgo,volgo-vcs,volgo-git-backend,volgo-git-unix,volgo-hg-backend,volgo-hg-unix" >> "$GITHUB_ENV"
5259
else
5360
echo "PACKAGES=volgo,volgo-base,volgo-base-tests,volgo-vcs,volgo-git-backend,volgo-git-unix,volgo-git-eio,volgo-hg-backend,volgo-hg-unix,volgo-hg-eio,vcs-test-helpers,volgo-tests" >> "$GITHUB_ENV"
5461
fi
5562
5663
- name: Setup Dune
57-
uses: mbarbin/setup-dune@ae2985bcdedc6fb24e5743d6f9dace9cf262b41c # v2.0.0+patch-4
64+
uses: mbarbin/setup-dune@03ede0220d3fe665f250727d8e21b7c0f9517f3b # v2.0.0+patch-7
65+
env:
66+
GH_TOKEN: ${{ github.token }}
5867
with:
59-
version: "3.21.0"
60-
workspace: ${{ env.DUNE_WORKSPACE }}
61-
cache-prefix: ${{ matrix.ocaml-version }}
68+
version: "${{ matrix.dune-version }}"
69+
dune-digest: "${{ matrix.dune-digest }}"
70+
workspace: "${{ env.DUNE_WORKSPACE }}"
71+
cache-prefix: "${{ matrix.ocaml-version }}"
6272
cache-readonly: ${{ github.ref != 'refs/heads/main' }}
6373
only-packages: ${{ env.PACKAGES }}
6474
steps: install-dune enable-pkg lazy-update-depexts install-gpatch install-depexts

‎.github/workflows/dunolint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
- name: Install dunolint
2222
uses: mbarbin/dunolint-actions/setup-dunolint@ddc2b3ee5e8e5558d74c68643c63d37c11eb7279 # v1.0.0-alpha.6
2323
with:
24-
dunolint-version: 0.0.20260306
25-
dunolint-digest: sha256:b83c07dd352cd4bec36b872ac593f299972710baff70a62e7a4650e80d2460d4
24+
dunolint-version: "0.0.20260306"
25+
dunolint-digest: "sha256:b83c07dd352cd4bec36b872ac593f299972710baff70a62e7a4650e80d2460d4"
2626

2727
- name: Lint Check
2828
uses: mbarbin/dunolint-actions/lint-check@ddc2b3ee5e8e5558d74c68643c63d37c11eb7279 # v1.0.0-alpha.6

‎.github/workflows/release-artifacts.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ jobs:
6161
- name: Checkout Code
6262
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
6363
with:
64-
ref: ${{ env.TAG_NAME }}
64+
ref: "${{ env.TAG_NAME }}"
6565

6666
- name: Setup OCaml
6767
uses: ocaml/setup-ocaml@dec6499fef64fc5d7ed43d43a87251b7b1c306f5 # v3.4.8
6868
with:
69-
ocaml-compiler: 5.3.x
69+
ocaml-compiler: "5.3.x"
7070
opam-repositories: |
7171
default: https://github.com/ocaml/opam-repository.git
7272
mbarbin: https://github.com/mbarbin/opam-repository.git

‎.github/workflows/test-deploy-doc.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ jobs:
1616
runs-on: ubuntu-latest
1717
env:
1818
OCAML_VERSION: "5.4"
19+
DUNE_VERSION: "3.22.0"
20+
DUNE_DIGEST: "sha256:33ca9308b48d9f5e90ee34f5b1045b53df6b5780a188556dab72af53621b5fba"
1921
defaults:
2022
run:
2123
shell: bash
@@ -38,13 +40,16 @@ jobs:
3840

3941
- name: Environment setup
4042
run: |
41-
echo "DUNE_WORKSPACE=$PWD/dune-workspace-${{ env.OCAML_VERSION }}" >> "$GITHUB_ENV"
43+
echo "DUNE_WORKSPACE=$PWD/dune-workspace.${{ env.OCAML_VERSION }}" >> "$GITHUB_ENV"
4244
4345
- name: Setup Dune
44-
uses: mbarbin/setup-dune@ae2985bcdedc6fb24e5743d6f9dace9cf262b41c # v2.0.0+patch-4
46+
uses: mbarbin/setup-dune@03ede0220d3fe665f250727d8e21b7c0f9517f3b # v2.0.0+patch-7
47+
env:
48+
GH_TOKEN: ${{ github.token }}
4549
with:
46-
version: "3.21.0"
47-
workspace: ${{ env.DUNE_WORKSPACE }}
50+
version: "${{ env.DUNE_VERSION }}"
51+
dune-digest: "${{ env.DUNE_DIGEST }}"
52+
workspace: "${{ env.DUNE_WORKSPACE }}"
4853
cache-prefix: "main-ci-${{ env.OCAML_VERSION }}"
4954
cache-readonly: true
5055
steps: install-dune enable-pkg lazy-update-depexts install-gpatch install-depexts

dune-workspace-4.14 renamed to dune-workspace.4.14

File renamed without changes.

dune-workspace-5.2 renamed to dune-workspace.5.2

File renamed without changes.

dune-workspace-5.3 renamed to dune-workspace.5.3

File renamed without changes.

0 commit comments

Comments
 (0)