From 4f9ce677a42c761d43675bdba886038644ad245e Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Mon, 5 Feb 2024 07:49:19 +0100 Subject: [PATCH 1/2] Use Github-hosted macos arm runner (macos-14) --- .github/workflows/ci.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 41099b87d..ac7ec1bd3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,13 +18,18 @@ jobs: matrix: # Stay on the oldest Ubuntu version that's still supported by Github Actions # to avoid glibc incompatibilities as far as possible. - os: [macos-latest, macos-arm, ubuntu-20.04, windows-latest] + os: [ + macos-13, # x64 + macos-14, # ARM + ubuntu-20.04, + windows-latest, + ] # syntax explanation: # https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#example-including-additional-values-into-combinations include: - - os: macos-latest + - os: macos-13 artifact-folder: darwin - - os: macos-arm + - os: macos-14 artifact-folder: darwinarm64 - os: ubuntu-20.04 artifact-folder: linux @@ -107,7 +112,7 @@ jobs: - name: Download MacOS binary uses: actions/download-artifact@v3 with: - name: macos-latest + name: macos-13 path: binaries - run: tar -xvf binary.tar working-directory: binaries @@ -115,7 +120,7 @@ jobs: - name: Download MacOS ARM binary uses: actions/download-artifact@v3 with: - name: macos-arm + name: macos-14 path: binaries - run: tar -xvf binary.tar working-directory: binaries From 81b0c9041e08d19fdcb76902f75e3feb8eeabcc3 Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Mon, 5 Feb 2024 07:56:20 +0100 Subject: [PATCH 2/2] Use latest setup-ocaml again --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ac7ec1bd3..ff125b8a2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,7 +54,7 @@ jobs: key: ${{matrix.os}}-rescript-vscode-v4 - name: Use OCaml - uses: ocaml/setup-ocaml@v2.1.7 + uses: ocaml/setup-ocaml@v2 with: ocaml-compiler: 4.14.x