diff --git a/.github/workflows/bindings.yml b/.github/workflows/bindings.yml index 50c1df73..55bd6048 100644 --- a/.github/workflows/bindings.yml +++ b/.github/workflows/bindings.yml @@ -21,12 +21,13 @@ jobs: env: CI: true - name: Install esy - run: npm install -g esy + run: npm install -g esy@latest + - name: Install and build PPX dependencies + working-directory: packages/rescript-relay/rescript-relay-ppx + run: esy install - name: Build PPX - uses: esy/github-action@6863524ed7748e7882e317e31ac2b8b107011744 - with: - cache-key: ${{ hashFiles('esy.lock/index.json') }} - working-directory: packages/rescript-relay/rescript-relay-ppx + working-directory: packages/rescript-relay/rescript-relay-ppx + run: esy build - name: Install run: | yarn --frozen-lockfile diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index fd12fc5a..cac664e9 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -24,16 +24,13 @@ jobs: toolchain: 1.76.0 override: true - name: Install esy - run: npm install -g esy - - uses: esy/github-action@6863524ed7748e7882e317e31ac2b8b107011744 - with: - cache-key: ${{ hashFiles('esy.lock/index.json') }} - working-directory: packages/rescript-relay/rescript-relay-ppx + run: npm install -g esy@latest + - name: Install and build PPX dependencies + working-directory: packages/rescript-relay/rescript-relay-ppx + run: esy install - name: Build PPX - uses: esy/github-action@6863524ed7748e7882e317e31ac2b8b107011744 - with: - cache-key: ${{ hashFiles('esy.lock/index.json') }} - working-directory: packages/rescript-relay/rescript-relay-ppx + working-directory: packages/rescript-relay/rescript-relay-ppx + run: esy build - name: Install - bindings working-directory: packages/rescript-relay run: | diff --git a/.github/workflows/ppx.yml b/.github/workflows/ppx.yml index e11ab456..92120d19 100644 --- a/.github/workflows/ppx.yml +++ b/.github/workflows/ppx.yml @@ -60,6 +60,9 @@ jobs: name: PPX runs-on: ${{ matrix.platform }} + defaults: + run: + working-directory: packages/rescript-relay/rescript-relay-ppx steps: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 @@ -68,15 +71,13 @@ jobs: env: CI: true - name: Install esy - run: npm install -g esy + run: npm install -g esy@latest + - name: Install and build dependencies + run: esy install - name: Build PPX - uses: esy/github-action@6863524ed7748e7882e317e31ac2b8b107011744 - with: - cache-key: ${{ matrix.platform }}-${{ hashFiles('esy.lock/index.json') }}-v3 - working-directory: packages/rescript-relay/rescript-relay-ppx + run: esy build - name: Strip PPX binary if: runner.os != 'Windows' - working-directory: packages/rescript-relay/rescript-relay-ppx run: | strip _build/default/bin/RescriptRelayPpxApp.exe - name: Upload PPX artifact ${{ matrix.platform }}