Skip to content

Commit 79a67ba

Browse files
committed
feat: Pin deps and use setup-ocaml@v3
1 parent 89ec203 commit 79a67ba

File tree

11 files changed

+105
-96
lines changed

11 files changed

+105
-96
lines changed

.github/workflows/esy.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ jobs:
2020

2121
steps:
2222
- name: Setup node.js
23-
uses: actions/setup-node@v3.6.0
23+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
2424
with:
25-
node-version: "16"
25+
node-version: "22"
2626
check-latest: true
2727

2828
# Install `esy` to build the project
@@ -33,7 +33,7 @@ jobs:
3333
npm i -g shx
3434
3535
- name: Checkout project
36-
uses: actions/checkout@v3.5.3
36+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3737
with:
3838
submodules: "recursive"
3939

@@ -43,7 +43,7 @@ jobs:
4343
4444
- name: Esy cache
4545
id: esy-cache
46-
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
46+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
4747
with:
4848
path: _export
4949
key: ${{ runner.os }}-esy-${{ hashFiles('esy.lock/index.json') }}

.github/workflows/opam.yml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,24 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
os: [ubuntu-latest, macos-latest, windows-latest]
20-
ocaml-compiler: [4.12.1, 4.13.1, 4.14.1]
20+
ocaml-compiler: [4.13.1, 4.14.1, 5.3.0]
2121

2222
steps:
2323
- name: Checkout project
24-
uses: actions/checkout@v3.5.3
24+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2525
with:
2626
submodules: "recursive"
2727

2828
- name: Setup OCaml ${{ matrix.ocaml-compiler }}
29-
uses: ocaml/setup-ocaml@0b8b8c6f352bfdd12fa56b6727eed5990aa22859 # v3.2.10
30-
if: ${{ startsWith(matrix.os, 'windows-') }}
31-
with:
32-
ocaml-compiler: ${{ matrix.ocaml-compiler }}
33-
opam-repositories: |
34-
opam-repository-mingw: https://github.com/ocaml-opam/opam-repository-mingw.git#sunset
35-
default: https://github.com/ocaml/opam-repository.git
36-
37-
- name: Setup OCaml ${{ matrix.ocaml-compiler }}
38-
uses: ocaml/setup-ocaml@0b8b8c6f352bfdd12fa56b6727eed5990aa22859 # v3.2.10
39-
if: ${{ !startsWith(matrix.os, 'windows-') }}
29+
uses: ocaml/setup-ocaml@c2e6bb92370612b89f302c3aaefa1da45ee2d702 # v3.2.15
4030
with:
4131
ocaml-compiler: ${{ matrix.ocaml-compiler }}
32+
33+
- name: Override C Compiler Flags For Windows
34+
if: ${{ startsWith(matrix.os, 'windows-') }}
35+
run: |
36+
echo "CC=x86_64-w64-mingw32-gcc" | Out-File -FilePath $env:GITHUB_ENV -Append
37+
echo "CXX=x86_64-w64-mingw32-g++" | Out-File -FilePath $env:GITHUB_ENV -Append
4238
4339
- name: Install local dependencies
4440
run: |

.github/workflows/release.yml

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

@@ -84,10 +84,16 @@ jobs:
8484
echo -n "$CHANGES" > CHANGES.md
8585
8686
- name: Setup OCaml
87-
uses: ocaml/setup-ocaml@0b8b8c6f352bfdd12fa56b6727eed5990aa22859 # v3.2.10
87+
uses: ocaml/setup-ocaml@c2e6bb92370612b89f302c3aaefa1da45ee2d702 # v3.2.15
8888
with:
8989
ocaml-compiler: 4.14.0
9090

91+
- name: Override C Compiler Flags For Windows
92+
if: ${{ startsWith(matrix.os, 'windows-') }}
93+
run: |
94+
echo "CC=x86_64-w64-mingw32-gcc" | Out-File -FilePath $env:GITHUB_ENV -Append
95+
echo "CXX=x86_64-w64-mingw32-g++" | Out-File -FilePath $env:GITHUB_ENV -Append
96+
9197
# Version 2.1.0 of opam-publish doesn't respect OPAMYES=1
9298
# Ref https://github.com/ocaml-opam/opam-publish/issues/132#issuecomment-963616802
9399
- name: Install publish utils
@@ -104,9 +110,9 @@ jobs:
104110
runs-on: ubuntu-latest
105111
steps:
106112
- name: Setup NodeJS
107-
uses: actions/setup-node@v3.6.0
113+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
108114
with:
109-
node-version: "16"
115+
node-version: "22"
110116
registry-url: "https://registry.npmjs.org"
111117

112118
- name: Publish to npm

binaryen.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ build: [
1212
[ "dune" "build" "-p" name "-j" jobs ]
1313
]
1414
depends: [
15-
"ocaml" {>= "4.12.0"}
15+
"ocaml" {>= "4.13.0"}
1616
"dune" {>= "3.0.0"}
1717
"dune-configurator" {>= "3.0.0"}
1818
"js_of_ocaml-compiler" {>= "4.1.0" < "6.0.0"}

esy.lock/index.json

Lines changed: 29 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

esy.lock/opam/ocp-indent.1.7.0/opam

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

esy.lock/opam/topkg.1.0.7/opam renamed to esy.lock/opam/topkg.1.0.8/opam

Lines changed: 6 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

esy.lock/opam/uutf.1.0.3/opam

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)