Skip to content

Commit 9318d4f

Browse files
authored
Try fixing esy (#568)
* try fixing esy * apply fix * try new approach
1 parent ffee58a commit 9318d4f

File tree

3 files changed

+19
-20
lines changed

3 files changed

+19
-20
lines changed

.github/workflows/bindings.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@ jobs:
2121
env:
2222
CI: true
2323
- name: Install esy
24-
run: npm install -g esy
24+
run: npm install -g esy@latest
25+
- name: Install and build PPX dependencies
26+
working-directory: packages/rescript-relay/rescript-relay-ppx
27+
run: esy install
2528
- name: Build PPX
26-
uses: esy/github-action@6863524ed7748e7882e317e31ac2b8b107011744
27-
with:
28-
cache-key: ${{ hashFiles('esy.lock/index.json') }}
29-
working-directory: packages/rescript-relay/rescript-relay-ppx
29+
working-directory: packages/rescript-relay/rescript-relay-ppx
30+
run: esy build
3031
- name: Install
3132
run: |
3233
yarn --frozen-lockfile

.github/workflows/integration-tests.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,13 @@ jobs:
2424
toolchain: 1.76.0
2525
override: true
2626
- name: Install esy
27-
run: npm install -g esy
28-
- uses: esy/github-action@6863524ed7748e7882e317e31ac2b8b107011744
29-
with:
30-
cache-key: ${{ hashFiles('esy.lock/index.json') }}
31-
working-directory: packages/rescript-relay/rescript-relay-ppx
27+
run: npm install -g esy@latest
28+
- name: Install and build PPX dependencies
29+
working-directory: packages/rescript-relay/rescript-relay-ppx
30+
run: esy install
3231
- name: Build PPX
33-
uses: esy/github-action@6863524ed7748e7882e317e31ac2b8b107011744
34-
with:
35-
cache-key: ${{ hashFiles('esy.lock/index.json') }}
36-
working-directory: packages/rescript-relay/rescript-relay-ppx
32+
working-directory: packages/rescript-relay/rescript-relay-ppx
33+
run: esy build
3734
- name: Install - bindings
3835
working-directory: packages/rescript-relay
3936
run: |

.github/workflows/ppx.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ jobs:
6060

6161
name: PPX
6262
runs-on: ${{ matrix.platform }}
63+
defaults:
64+
run:
65+
working-directory: packages/rescript-relay/rescript-relay-ppx
6366
steps:
6467
- uses: actions/checkout@v4
6568
- uses: actions/setup-node@v4
@@ -68,15 +71,13 @@ jobs:
6871
env:
6972
CI: true
7073
- name: Install esy
71-
run: npm install -g esy
74+
run: npm install -g esy@latest
75+
- name: Install and build dependencies
76+
run: esy install
7277
- name: Build PPX
73-
uses: esy/github-action@6863524ed7748e7882e317e31ac2b8b107011744
74-
with:
75-
cache-key: ${{ matrix.platform }}-${{ hashFiles('esy.lock/index.json') }}-v3
76-
working-directory: packages/rescript-relay/rescript-relay-ppx
78+
run: esy build
7779
- name: Strip PPX binary
7880
if: runner.os != 'Windows'
79-
working-directory: packages/rescript-relay/rescript-relay-ppx
8081
run: |
8182
strip _build/default/bin/RescriptRelayPpxApp.exe
8283
- name: Upload PPX artifact ${{ matrix.platform }}

0 commit comments

Comments
 (0)