From a1f5c094269040695a6244dddd4bea961a0b7220 Mon Sep 17 00:00:00 2001
From: TwinFan <twinfan@sonux.net>
Date: Sun, 4 Feb 2024 00:36:32 +0100
Subject: [PATCH] Update/XPMP2 and GitHub Actions

---
 .github/actions/upload-plugin/action.yml |  4 ++--
 .github/workflows/build.yml              | 16 +++++++++++-----
 CMakeLists.txt                           |  3 +++
 lib/XPMP2                                |  2 +-
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/.github/actions/upload-plugin/action.yml b/.github/actions/upload-plugin/action.yml
index 8ee557a..788b5e9 100644
--- a/.github/actions/upload-plugin/action.yml
+++ b/.github/actions/upload-plugin/action.yml
@@ -28,8 +28,8 @@ runs:
         mv "${{ inputs.pdbFileName }}" "deploy-${{ inputs.pluginName }}/${{ inputs.pluginName }}/${{ inputs.archFolder }}"
       fi
   - name: Upload plugin
-    uses: actions/upload-artifact@v3
+    uses: actions/upload-artifact@v4
     with:
-      name: ${{ inputs.pluginName }}
+      name: ${{ inputs.pluginName }}-${{ env.platform }}
       path: deploy-${{ inputs.pluginName }}/*   # this way the top folder in the artifacts is "MyPlugin"
       if-no-files-found: error
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d3e0a34..574ea7d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,10 +20,12 @@ jobs:
   #####################################
   # Linux with GCC
   build-lin:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
+    env:
+      platform: lin
     steps:
     - name: Checkout Code
-      uses: actions/checkout@v3       # must checkout before we can use our own actions
+      uses: actions/checkout@v4       # must checkout before we can use our own actions
       with:
         submodules: 'recursive'
     - name: Build
@@ -42,10 +44,12 @@ jobs:
   #####################################
   # MacOS with CMake/clang and sign/notarize in self-written script
   build-mac:
-    runs-on: macos-latest
+    runs-on: macos-12
+    env:
+      platform: mac
     steps:
     - name: Checkout Code
-      uses: actions/checkout@v3       # must checkout before we can use our own actions
+      uses: actions/checkout@v4       # must checkout before we can use our own actions
       with:
         submodules: 'recursive'
     - name: Build
@@ -86,9 +90,11 @@ jobs:
   # Windows with MS Visual Studio
   build-win:
     runs-on: windows-2022
+    env:
+      platform: win
     steps:
     - name: Checkout Code
-      uses: actions/checkout@v3       # must checkout before we can use our own actions
+      uses: actions/checkout@v4       # must checkout before we can use our own actions
       with:
         submodules: 'recursive'
     - name: Build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8ff810..9e19b77 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,9 @@ if(DEFINED ENV{platform})
     elseif($ENV{platform} STREQUAL "mac-arm")
         message ("   Building cross-platform for mac/arm64")
         set(CMAKE_OSX_ARCHITECTURES "arm64" CACHE STRING "Archs to build")
+    elseif($ENV{platform} STREQUAL "mac")
+        message ("   Building cross-platform for both mac/x86_64 and mac/arm64")
+        set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "Archs to build")
     endif()
 else()
     # No 'platform' defined could mean running from command line, assume we build universal image in one go via XCode
diff --git a/lib/XPMP2 b/lib/XPMP2
index 3afcd13..280e5d6 160000
--- a/lib/XPMP2
+++ b/lib/XPMP2
@@ -1 +1 @@
-Subproject commit 3afcd13e0d2b55eafa45b5bca1ba3d066452d318
+Subproject commit 280e5d64b7b56d2c088fed703f2edbd2b4bc0054