From abe72304ec23e715a2ba0f7725beba116803e11d Mon Sep 17 00:00:00 2001
From: Simon Urbanek <simon.urbanek@r-project.org>
Date: Sat, 14 Jun 2025 14:52:58 +1200
Subject: [PATCH 1/2] Update build.yaml

---
 .github/workflows/build.yaml | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c874ea7..b090544 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -4,20 +4,32 @@ name: Build
 
 jobs:
   Build:
-    runs-on: 'macOS-latest'
+    runs-on: ${{ matrix.os }}
+
+    name: ${{ matrix.os }} R ${{ matrix.r-version }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ macos-13, macos-14 ]
+        r-version: [ release, devel ]
 
     steps:
       - uses: actions/checkout@v4
 
+      - name: Install R
+        uses: s-u/R-actions/install@v2
+        with:
+          r-version: ${{ matrix.r-version }}
+          tools: base
+
       - name: Build
         shell: bash
         run: |
-          echo Downloading R ...
-          curl -s -LO https://mac.r-project.org/big-sur/last-success/R-release-x86_64.tar.xz
-          echo Unpacking R ...
-          sudo rm -rf /Library/Frameworks/R.framework
-          if [ ! -e /Library/Frameworks ]; then mkdir -p /Library/Frameworks; fi 
-          sudo tar fxz R-release-x86_64.tar.xz -C /Library/Frameworks/
+          ## Build Mac-GUI
+          echo Setup texinfo ...
+          Rscript -e 'source("https://mac.R-project.org/bin/install.R"); install.libs("texinfo", dep=FALSE)'
+          echo Build ...
           mkdir -p build/logs
           for bld in Release Debug; do
             echo Build $bld ..
@@ -28,10 +40,10 @@ jobs:
           mv build/Debug R-GUI-build/
           mv build/Release R-GUI-build/
           mv build/logs R-GUI-build/
-          hdiutil create -srcfolder R-GUI-build R-GUI-build.dmg
+          hdiutil create -srcfolder R-GUI-build R-GUI-build-${{ matrix.os }}-${{ matrix.r-version }}.dmg
 
       - name: Upload build results
         uses: actions/upload-artifact@master
         with:
-          path: R-GUI-build.dmg
-          name: R-GUI-build
+          path: R-GUI-build-${{ matrix.os }}-${{ matrix.r-version }}.dmg
+          name: R-GUI-build-${{ matrix.os }}-${{ matrix.r-version }}

From 690fe53422bc0fc834adb49e22790806ff42cc19 Mon Sep 17 00:00:00 2001
From: Simon Urbanek <simon.urbanek@r-project.org>
Date: Sat, 14 Jun 2025 14:56:34 +1200
Subject: [PATCH 2/2] fix arch

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b090544..2da6e85 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -33,7 +33,7 @@ jobs:
           mkdir -p build/logs
           for bld in Release Debug; do
             echo Build $bld ..
-            xcodebuild -configuration $bld -arch x86_64 2>&1 | tee build/logs/$bld.log
+            xcodebuild -configuration $bld -arch `uname -m` 2>&1 | tee build/logs/$bld.log
           done
           echo Pack ...
           mkdir R-GUI-build