Skip to content

Commit b4f5224

Browse files
spotandjakeospencer
authored andcommitted
chore: Use setup-ocaml@v3 (#112)
feat: Support OCaml 5 chore!: Drop support for OCaml 4.12
1 parent b426af7 commit b4f5224

File tree

33 files changed

+536
-1028
lines changed

33 files changed

+536
-1028
lines changed

.github/workflows/esy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
steps:
1717
- name: Setup node.js
18-
uses: actions/setup-node@v3.6.0
18+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
1919
with:
2020
node-version: "16"
2121
check-latest: true
@@ -28,7 +28,7 @@ jobs:
2828
npm i -g shx
2929
3030
- name: Checkout project
31-
uses: actions/checkout@v3.5.3
31+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3232
with:
3333
submodules: "recursive"
3434

@@ -38,7 +38,7 @@ jobs:
3838
3939
- name: Esy cache
4040
id: esy-cache
41-
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
41+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
4242
with:
4343
path: _export
4444
key: ${{ runner.os }}-esy-${{ hashFiles('esy.lock/index.json') }}

.github/workflows/js.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
steps:
1313
- name: Setup node.js
14-
uses: actions/setup-node@v3.6.0
14+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
1515
with:
1616
node-version: "16"
1717
check-latest: true
@@ -31,7 +31,7 @@ jobs:
3131
echo "$HOME/cmake/bin" >> $GITHUB_PATH
3232
3333
- name: Checkout project
34-
uses: actions/checkout@v3.5.3
34+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3535
with:
3636
submodules: "recursive"
3737

.github/workflows/opam.yml

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,17 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
os: [ubuntu-22.04, macos-latest, windows-latest]
15-
ocaml-compiler: [4.12.1, 4.13.1, 4.14.1]
14+
os: [ubuntu-latest, macos-latest, windows-latest]
15+
ocaml-compiler: [4.13.1, 4.14.1, 5.3.0]
1616

1717
steps:
1818
- name: Checkout project
19-
uses: actions/checkout@v3.5.3
19+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2020
with:
2121
submodules: "recursive"
2222

2323
- name: Setup OCaml ${{ matrix.ocaml-compiler }}
24-
uses: ocaml/setup-ocaml@v2
25-
if: ${{ startsWith(matrix.os, 'windows-') }}
26-
with:
27-
ocaml-compiler: ${{ matrix.ocaml-compiler }}
28-
opam-repositories: |
29-
opam-repository-mingw: https://github.com/ocaml-opam/opam-repository-mingw.git#sunset
30-
default: https://github.com/ocaml/opam-repository.git
31-
32-
- name: Setup OCaml ${{ matrix.ocaml-compiler }}
33-
uses: ocaml/setup-ocaml@v2
34-
if: ${{ !startsWith(matrix.os, 'windows-') }}
24+
uses: ocaml/setup-ocaml@c2e6bb92370612b89f302c3aaefa1da45ee2d702 # v3.2.15
3525
with:
3626
ocaml-compiler: ${{ matrix.ocaml-compiler }}
3727

@@ -71,12 +61,12 @@ jobs:
7161
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 100
7262
7363
- name: Checkout project
74-
uses: actions/checkout@v3.5.3
64+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7565
with:
7666
submodules: "recursive"
7767

7868
- name: Setup OCaml ${{ matrix.ocaml-compiler }}
79-
uses: ocaml/setup-ocaml@v2
69+
uses: ocaml/setup-ocaml@c2e6bb92370612b89f302c3aaefa1da45ee2d702 # v3.2.15
8070
with:
8171
ocaml-compiler: ${{ matrix.ocaml-compiler }}
8272

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
brew install git-archive-all
3636
3737
- name: Checkout code
38-
uses: actions/checkout@v3.5.3
38+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3939
with:
4040
submodules: "recursive"
4141

@@ -83,7 +83,7 @@ jobs:
8383
echo -n "$CHANGES" > CHANGES.md
8484
8585
- name: Setup OCaml
86-
uses: ocaml/setup-ocaml@v2
86+
uses: ocaml/setup-ocaml@c2e6bb92370612b89f302c3aaefa1da45ee2d702 # v3.2.15
8787
with:
8888
ocaml-compiler: 4.14.0
8989

@@ -101,7 +101,7 @@ jobs:
101101
runs-on: ubuntu-22.04
102102
steps:
103103
- name: Setup NodeJS
104-
uses: actions/setup-node@v3.6.0
104+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
105105
with:
106106
node-version: "16"
107107
registry-url: "https://registry.npmjs.org"

dune

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@
125125
binaryen
126126
-G
127127
"Unix Makefiles"
128+
-DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc
129+
-DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++
128130
"-DCMAKE_SYSTEM_NAME=Windows"
129131
; GCC 7 (shipped with esy) doesn't like _ for unused variables
130132
"-DCMAKE_CXX_FLAGS=-Wno-unused-variable -Wno-maybe-uninitialized"

0 commit comments

Comments
 (0)