Skip to content

Fix CI macos-13 #593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zth merged 4 commits into from
Dec 12, 2025
Merged

Fix CI macos-13 #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
36b9085
move to macos-15-intel after retirement of macos-13
tsnobip Dec 12, 2025
a5b822a
remove deprecated set-output
tsnobip Dec 12, 2025
bcd8d69
handle multiline
tsnobip Dec 12, 2025
197bafe
fix relay submodule
tsnobip Dec 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/build-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ jobs:
strategy:
matrix:
platform: [
macos-13, # x64
macos-14, # ARM,
macos-15-intel, # x64
macos-15, # ARM,
windows-latest,
]

Expand Down Expand Up @@ -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
Expand All @@ -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: |
Expand All @@ -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
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/integration-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ jobs:
- name: git status
id: git_status
run: |
echo "::set-output name=status::$( git status --porcelain )"
echo 'status<<EOF' >> $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:"
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion packages/relay
Open in desktop
Submodule relay updated 14 files
+10 −9 compiler/crates/relay-typegen/src/rescript.rs
+2 −2 compiler/test-project-res/src/__generated__/TestCodesplitQuery_graphql.res
+2 −2 compiler/test-project-res/src/__generated__/TestCustomScalars2Query_graphql.res
+4 −4 compiler/test-project-res/src/__generated__/TestCustomScalarsQuery_graphql.res
+2 −2 compiler/test-project-res/src/__generated__/TestLocalPayloadViaNodeInterfaceQuery_graphql.res
+2 −2 compiler/test-project-res/src/__generated__/TestPaginationInNodeQuery_graphql.res
+8 −8 compiler/test-project-res/src/__generated__/TestPaginationInNodeRefetchQuery_graphql.res
+2 −2 compiler/test-project-res/src/__generated__/TestPaginationUnionQuery_graphql.res
+8 −8 compiler/test-project-res/src/__generated__/TestPaginationUnionRefetchQuery_graphql.res
+2 −2 compiler/test-project-res/src/__generated__/TestQueryInputObjQuery_graphql.res
+2 −2 compiler/test-project-res/src/__generated__/TestQuery_graphql.res
+2 −2 compiler/test-project-res/src/__generated__/TestRefetchingInNodeQuery_graphql.res
+6 −6 compiler/test-project-res/src/__generated__/TestRefetchingInNodeRefetchQuery_graphql.res
+6 −6 compiler/test-project-res/src/__generated__/TestRefetchingRefetchQuery_graphql.res
Loading