Give macos-13-xlarge a try on GitHub Actions

https://github.blog/2023-10-02-introducing-the-new-apple-silicon-powered-m1-macos-larger-runner-for-github-actions/
dahlia · Oct 2, 2023 · 93affc1 · 93affc1
1 parent 9698c24
commit 93affc1
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 7 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -12,7 +12,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, macos-11, windows-2022]
+        os:
+        - ubuntu-22.04
+        - macos-11  # Intel
+        - macos-13-xlarge  # Apple silicon
+        - windows-2022
         ghc-version:
         - "8.8"
         - "8.10"
@@ -23,6 +27,12 @@ jobs:
           ghc-version: "8.10"
         - os: macos-11
           ghc-version: "9.0"
+        - os: macos-13-xlarge
+          ghc-version: "8.8"
+        - os: macos-13-xlarge
+          ghc-version: "8.10"
+        - os: macos-13-xlarge
+          ghc-version: "9.0"
         - os: windows-2022
           ghc-version: "8.10"
         - os: windows-2022
@@ -52,6 +62,12 @@ jobs:
           %APPDATA%\cabal\store
           %APPDATA%\stack
         key: stack-${{ matrix.os }}-ghc-${{ matrix.version }}
+    - name: Install Haskell Stack (if not installed)
+      shell: bash
+      run: |
+        if ! command -v stack > /dev/null; then
+          curl -sSL https://get.haskellstack.org/ | sh
+        fi
     - name: Set up resolver
       shell: bash
       run: |
@@ -148,7 +164,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, macos-11, windows-2022]
+        os:
+        - ubuntu-22.04
+        - macos-11  # Intel
+        - macos-13-xlarge  # Apple silicon
+        - windows-2022
     steps:
     - uses: actions/checkout@v3
     - uses: denoland/setup-deno@v1
@@ -309,10 +329,14 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
+    - uses: actions/download-artifact@v3
+      with:
+        name: binaries-macos-13-xlarge-ghc-9.2
+        path: /tmp/binaries-macos-arm64
     - uses: actions/download-artifact@v3
       with:
         name: binaries-macos-11-ghc-9.2
-        path: /tmp/binaries-macos
+        path: /tmp/binaries-macos-x86_64
     - uses: actions/download-artifact@v3
       with:
         name: binaries-windows-2022-ghc-9.2
@@ -332,8 +356,14 @@ jobs:
         cp "$GITHUB_WORKSPACE/"{LICENSE,README.md,CHANGES.md} ./
         tar cvfj /tmp/dists/seonbi.linux-x86_64.tar.bz2 *
         popd
-        # macOS
-        pushd /tmp/binaries-macos
+        # macOS (Apple silicon)
+        pushd /tmp/binaries-macos-arm64
+        chmod +x *
+        cp "$GITHUB_WORKSPACE/"{LICENSE,README.md,CHANGES.md} ./
+        tar cvfj /tmp/dists/seonbi.macos-arm64.tar.bz2 *
+        popd
+        # macOS (Intel)
+        pushd /tmp/binaries-macos-x86_64
         chmod +x *
         cp "$GITHUB_WORKSPACE/"{LICENSE,README.md,CHANGES.md} ./
         tar cvfj /tmp/dists/seonbi.macos-x86_64.tar.bz2 *

diff --git a/README.md b/README.md
@@ -95,8 +95,9 @@ programming.  For such end-users, here's the list of end-user apps:
 Installation
 ------------
 
-Seonbi provides official executable binaries for Linux (x86_64), macOS,
-and Windows (64-bit).  You can download them from the [releases] page.
+Seonbi provides official executable binaries for Linux (x86_64), macOS (Apple
+silicon & Intel), and Windows (64-bit).  You can download them from
+the [releases] page.
 
 If you prefer [Scoop] on Windows use the Seonbi official bucket: