Skip to content

Commit 851d518

Browse files
mbarbinmbarbin
committed
Upgrade CIs
1 parent faa9312 commit 851d518

7 files changed

Lines changed: 41 additions & 28 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,32 @@ 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: Environment setup
3530
run: |
36-
echo "DUNE_WORKSPACE=$PWD/dune-workspace-${{ matrix.ocaml-version }}" >> "$GITHUB_ENV"
31+
echo "DUNE_WORKSPACE=$PWD/dune-workspace.${{ env.OCAML_VERSION }}" >> "$GITHUB_ENV"
3732
3833
- name: Setup Dune
39-
uses: mbarbin/setup-dune@ae2985bcdedc6fb24e5743d6f9dace9cf262b41c # v2.0.0+patch-4
34+
uses: mbarbin/setup-dune@03ede0220d3fe665f250727d8e21b7c0f9517f3b # v2.0.0+patch-7
35+
env:
36+
GH_TOKEN: ${{ github.token }}
4037
with:
41-
version: "3.21.0"
42-
workspace: ${{ env.DUNE_WORKSPACE }}
43-
cache-prefix: "main-ci-${{ matrix.ocaml-version }}"
38+
version: "${{ env.DUNE_VERSION }}"
39+
dune-digest: "${{ env.DUNE_DIGEST }}"
40+
workspace: "${{ env.DUNE_WORKSPACE }}"
41+
cache-prefix: "main-ci-${{ env.OCAML_VERSION }}"
4442
cache-readonly: ${{ github.ref != 'refs/heads/main' }}
4543
steps: install-dune enable-pkg lazy-update-depexts install-gpatch install-depexts
4644

‎.github/workflows/deploy-odoc.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
@@ -27,13 +29,16 @@ jobs:
2729

2830
- name: Environment setup
2931
run: |
30-
echo "DUNE_WORKSPACE=$PWD/dune-workspace-${{ env.OCAML_VERSION }}" >> "$GITHUB_ENV"
32+
echo "DUNE_WORKSPACE=$PWD/dune-workspace.${{ env.OCAML_VERSION }}" >> "$GITHUB_ENV"
3133
3234
- name: Setup Dune
33-
uses: mbarbin/setup-dune@ae2985bcdedc6fb24e5743d6f9dace9cf262b41c # v2.0.0+patch-4
35+
uses: mbarbin/setup-dune@03ede0220d3fe665f250727d8e21b7c0f9517f3b # v2.0.0+patch-7
36+
env:
37+
GH_TOKEN: ${{ github.token }}
3438
with:
35-
version: "3.21.0"
36-
workspace: ${{ env.DUNE_WORKSPACE }}
39+
version: "${{ env.DUNE_VERSION }}"
40+
dune-digest: "${{ env.DUNE_DIGEST }}"
41+
workspace: "${{ env.DUNE_WORKSPACE }}"
3742
cache-prefix: "main-ci-${{ env.OCAML_VERSION }}"
3843
cache-readonly: true
3944
steps: install-dune enable-pkg lazy-update-depexts install-gpatch install-depexts
@@ -42,7 +47,7 @@ jobs:
4247
run: dune build @doc
4348

4449
- name: Upload Build Artifact
45-
uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4.0.0
50+
uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 # v5.0.0
4651
with:
4752
path: _build/default/_doc/_html
4853

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

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ jobs:
2828
- "5.4"
2929
- "5.3"
3030
- "5.2"
31+
include:
32+
- os: ubuntu-latest
33+
dune-version: "3.22.0"
34+
dune-digest: "sha256:33ca9308b48d9f5e90ee34f5b1045b53df6b5780a188556dab72af53621b5fba"
35+
- os: macos-latest
36+
dune-version: "3.22.0"
37+
dune-digest: "sha256:66aa2c005b1c5c60daf711aee0630cc988b6038aa86ca807879e281145f232cb"
3138
exclude:
3239
# Exclude the combination already tested in the main ci workflow.
3340
- os: ubuntu-latest
@@ -45,15 +52,18 @@ jobs:
4552

4653
- name: Environment setup
4754
run: |
48-
echo "DUNE_WORKSPACE=$PWD/dune-workspace-${{ matrix.ocaml-version }}" >> "$GITHUB_ENV"
55+
echo "DUNE_WORKSPACE=$PWD/dune-workspace.${{ matrix.ocaml-version }}" >> "$GITHUB_ENV"
4956
echo "PACKAGES=auto-format,auto-format-tests,auto-format-example" >> "$GITHUB_ENV"
5057
5158
- name: Setup Dune
52-
uses: mbarbin/setup-dune@ae2985bcdedc6fb24e5743d6f9dace9cf262b41c # v2.0.0+patch-4
59+
uses: mbarbin/setup-dune@03ede0220d3fe665f250727d8e21b7c0f9517f3b # v2.0.0+patch-7
60+
env:
61+
GH_TOKEN: ${{ github.token }}
5362
with:
54-
version: "3.21.0"
55-
workspace: ${{ env.DUNE_WORKSPACE }}
56-
cache-prefix: ${{ matrix.ocaml-version }}
63+
version: "${{ matrix.dune-version }}"
64+
dune-digest: "${{ matrix.dune-digest }}"
65+
workspace: "${{ env.DUNE_WORKSPACE }}"
66+
cache-prefix: "${{ matrix.ocaml-version }}"
5767
cache-readonly: ${{ github.ref != 'refs/heads/main' }}
5868
only-packages: ${{ env.PACKAGES }}
5969
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

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.

dune-workspace-5.4 renamed to dune-workspace.5.4

File renamed without changes.

0 commit comments

Comments
 (0)