Skip to content

Commit 49e14fb

Browse files
authored
Fix CI macos-13 (#593)
* move to macos-15-intel after retirement of macos-13 * remove deprecated set-output * handle multiline * fix relay submodule
1 parent 87dc6ed commit 49e14fb

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

.github/workflows/build-release.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ jobs:
5353
strategy:
5454
matrix:
5555
platform: [
56-
macos-13, # x64
57-
macos-14, # ARM,
56+
macos-15-intel, # x64
57+
macos-15, # ARM,
5858
windows-latest,
5959
]
6060

@@ -211,12 +211,12 @@ jobs:
211211

212212
- uses: actions/[email protected]
213213
with:
214-
name: ppx-macos-13
214+
name: ppx-macos-15-intel
215215
path: binaries
216216

217217
- uses: actions/[email protected]
218218
with:
219-
name: ppx-macos-14
219+
name: ppx-macos-15
220220
path: binaries
221221

222222
- uses: actions/[email protected]
@@ -226,11 +226,11 @@ jobs:
226226

227227
- name: Rename MacOS old binary
228228
run: |
229-
mv binaries/ppx-macos-13 binaries/ppx-macos-latest
229+
mv binaries/ppx-macos-15-intel binaries/ppx-macos-latest
230230
231231
- name: Rename MacOS ARM64 binary
232232
run: |
233-
mv binaries/ppx-macos-14 binaries/ppx-macos-arm64
233+
mv binaries/ppx-macos-15 binaries/ppx-macos-arm64
234234
235235
- name: Move binaries into release directory
236236
run: |
@@ -240,8 +240,8 @@ jobs:
240240
with:
241241
name: |
242242
ppx-linux
243-
ppx-macos-13
244-
ppx-macos-14
243+
ppx-macos-15-intel
244+
ppx-macos-15
245245
ppx-windows-latest
246246
relay-compiler-linux-x64
247247
relay-compiler-macos-x64

.github/workflows/integration-tests.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ jobs:
4646
- name: git status
4747
id: git_status
4848
run: |
49-
echo "::set-output name=status::$( git status --porcelain )"
49+
echo 'status<<EOF' >> $GITHUB_OUTPUT
50+
git status --porcelain >> $GITHUB_OUTPUT
51+
echo 'EOF' >> $GITHUB_OUTPUT
5052
- name: Exit if files modified
5153
run: |
5254
echo "Files have been modified during the build process:"

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[submodule "rescript-relay-compiler"]
22
path = packages/relay
33
url = [email protected]:zth/relay.git
4-
branch = rescript-relay
4+
branch = rescriptrelay-2.0

0 commit comments

Comments
 (0)