From 3da739a757c03ac17b7a4cb6da4b983a8c09b14f Mon Sep 17 00:00:00 2001
From: Joseph Malloch <joseph.malloch@gmail.com>
Date: Mon, 28 Oct 2024 15:43:39 -0300
Subject: [PATCH 1/2] CI: downgrade MacOS runner to MacOS-13 to build on x86.
 Future commit should fix cross compilation script to run on Apple silicon

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 90501f5..db92d0c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,8 +29,8 @@ jobs:
         path: |
           liblo*.tar.gz
 
-  MacOS-Latest:
-    runs-on: macOS-latest
+  MacOS:
+    runs-on: macOS-13
     timeout-minutes: 20
     env:
       CC: clang

From 29dbfaf8fa9ef391c8207332fcee44611bb2e775 Mon Sep 17 00:00:00 2001
From: Joseph Malloch <joseph.malloch@gmail.com>
Date: Wed, 6 Nov 2024 11:38:33 -0400
Subject: [PATCH 2/2] CI: upgrade checkout and upload-artifact actions.

---
 .github/workflows/ci.yml | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index db92d0c..ad0d5e3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: install dependencies
@@ -24,8 +24,9 @@ jobs:
       run: make test
     - name: make dist
       run: make dist
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
+        name: tarball
         path: |
           liblo*.tar.gz
 
@@ -36,7 +37,7 @@ jobs:
       CC: clang
       CXX: clang++
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: install dependencies
@@ -90,15 +91,16 @@ jobs:
         && cd ../..
     - name: make test
       run: make test
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
+        name: dylib
         path: ./inst/lib/liblo.7.dylib
 
   Windows-Latest:
     runs-on: windows-latest
     timeout-minutes: 20
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: Run windows build script
@@ -112,3 +114,13 @@ jobs:
       run: |
         cd bld\
         ctest -V
+
+  merge:
+    runs-on: ubuntu-latest
+    needs: [Linux, MacOS]
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: artifact
+          delete-merged: true