Skip to content

Commit 9035328

Browse files
spotandjakespotandjake
committed
feat(deps): Update actions dependencies
chore: Furthur strip testing actually use `v3` Try gcc 14 Use v3 for both Re-enable os matrix Log sh loc Log sh loc Try rm sh unlikely After deps install log cygwin log cygwin log path sys setup move order echo bin no way this works given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names given up on good commit names
1 parent 5a7a21d commit 9035328

File tree

6 files changed

+16
-26
lines changed

6 files changed

+16
-26
lines changed

‎.github/workflows/esy.yml‎

Lines changed: 2 additions & 2 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@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@v4.2.2
3232
with:
3333
submodules: "recursive"
3434

‎.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@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@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.14.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@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@v3
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@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@v3
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
@@ -34,7 +34,7 @@ jobs:
3434
brew install git-archive-all
3535
3636
- name: Checkout code
37-
uses: actions/checkout@v3.5.3
37+
uses: actions/checkout@v4.2.2
3838
with:
3939
submodules: "recursive"
4040

@@ -82,7 +82,7 @@ jobs:
8282
echo -n "$CHANGES" > CHANGES.md
8383
8484
- name: Setup OCaml
85-
uses: ocaml/setup-ocaml@v2
85+
uses: ocaml/setup-ocaml@v3
8686
with:
8787
ocaml-compiler: 4.14.0
8888

@@ -100,7 +100,7 @@ jobs:
100100
runs-on: ubuntu-22.04
101101
steps:
102102
- name: Setup NodeJS
103-
uses: actions/setup-node@v3.6.0
103+
uses: actions/setup-node@v4.3.0
104104
with:
105105
node-version: "16"
106106
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"

‎package.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@
2424
"dune build -p libbinaryen -j 4"
2525
],
2626
"buildEnv": {
27-
"PATH": "#{os == 'windows' ? '/usr/x86_64-w64-mingw32/sys-root/mingw/bin' : '' : $PATH }",
28-
"CC": "#{os == 'windows' ? 'x86_64-w64-mingw32-gcc' : ''}",
29-
"CXX": "#{os == 'windows' ? 'x86_64-w64-mingw32-g++' : ''}"
27+
"PATH": "#{os == 'windows' ? '/usr/x86_64-w64-mingw32/sys-root/mingw/bin' : '' : $PATH }"
3028
},
3129
"exportedEnv": {
3230
"PATH": {

0 commit comments

Comments
 (0)