From 36b90856c4626eb838eac5731407dabbeffcc6b3 Mon Sep 17 00:00:00 2001 From: tsnobip Date: Fri, 12 Dec 2025 15:50:24 +0100 Subject: [PATCH 1/4] move to macos-15-intel after retirement of macos-13 --- .github/workflows/build-release.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 28e0942f..1fac71e1 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -53,8 +53,8 @@ jobs: strategy: matrix: platform: [ - macos-13, # x64 - macos-14, # ARM, + macos-15-intel, # x64 + macos-15, # ARM, windows-latest, ] @@ -211,12 +211,12 @@ jobs: - uses: actions/download-artifact@v4.1.7 with: - name: ppx-macos-13 + name: ppx-macos-15-intel path: binaries - uses: actions/download-artifact@v4.1.7 with: - name: ppx-macos-14 + name: ppx-macos-15 path: binaries - uses: actions/download-artifact@v4.1.7 @@ -226,11 +226,11 @@ jobs: - name: Rename MacOS old binary run: | - mv binaries/ppx-macos-13 binaries/ppx-macos-latest + mv binaries/ppx-macos-15-intel binaries/ppx-macos-latest - name: Rename MacOS ARM64 binary run: | - mv binaries/ppx-macos-14 binaries/ppx-macos-arm64 + mv binaries/ppx-macos-15 binaries/ppx-macos-arm64 - name: Move binaries into release directory run: | @@ -240,8 +240,8 @@ jobs: with: name: | ppx-linux - ppx-macos-13 - ppx-macos-14 + ppx-macos-15-intel + ppx-macos-15 ppx-windows-latest relay-compiler-linux-x64 relay-compiler-macos-x64 From a5b822a1da6bd73494bd2c409111b5980ba92b26 Mon Sep 17 00:00:00 2001 From: tsnobip Date: Fri, 12 Dec 2025 15:51:27 +0100 Subject: [PATCH 2/4] remove deprecated set-output --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 2af0d2a4..bbfad823 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -46,7 +46,7 @@ jobs: - name: git status id: git_status run: | - echo "::set-output name=status::$( git status --porcelain )" + echo "status=$( git status --porcelain )" >> $GITHUB_OUTPUT - name: Exit if files modified run: | echo "Files have been modified during the build process:" From bcd8d6985287d3b11603d4c0163e588ec6b7ce5c Mon Sep 17 00:00:00 2001 From: tsnobip Date: Fri, 12 Dec 2025 16:11:04 +0100 Subject: [PATCH 3/4] handle multiline --- .github/workflows/integration-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index bbfad823..cc499573 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -46,7 +46,9 @@ jobs: - name: git status id: git_status run: | - echo "status=$( git status --porcelain )" >> $GITHUB_OUTPUT + echo 'status<> $GITHUB_OUTPUT + git status --porcelain >> $GITHUB_OUTPUT + echo 'EOF' >> $GITHUB_OUTPUT - name: Exit if files modified run: | echo "Files have been modified during the build process:" From 197bafed62de3bc8f4a3a15dd5fb058db61b0374 Mon Sep 17 00:00:00 2001 From: tsnobip Date: Fri, 12 Dec 2025 16:23:44 +0100 Subject: [PATCH 4/4] fix relay submodule --- .gitmodules | 2 +- packages/relay | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1c6cf029..71772130 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "rescript-relay-compiler"] path = packages/relay url = git@github.com:zth/relay.git - branch = rescript-relay + branch = rescriptrelay-2.0 diff --git a/packages/relay b/packages/relay index 9296be1f..9de559a0 160000 --- a/packages/relay +++ b/packages/relay @@ -1 +1 @@ -Subproject commit 9296be1f6fa7b8fd9fd326d556b20222b04c331e +Subproject commit 9de559a09fd95491e3e43d17e06b855c483f8d66