From d8e3df24081a2be94e1322364bc3350f1dbf9b0d Mon Sep 17 00:00:00 2001
From: Silvio Kunaschk <silvio.kunaschk@gmail.com>
Date: Tue, 14 Nov 2023 15:20:02 +0100
Subject: [PATCH] update toolchain and RackSDK.cmake

---
 .github/workflows/build-plugin.yml | 9 +++++----
 RackSDK.cmake                      | 7 ++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-plugin.yml b/.github/workflows/build-plugin.yml
index 411d4a79..39e70b9e 100644
--- a/.github/workflows/build-plugin.yml
+++ b/.github/workflows/build-plugin.yml
@@ -1,8 +1,10 @@
 name: Build VCV Rack Plugin
 on: [push, pull_request]
+name: Build VCV Rack Plugin
+on: [push, pull_request]
 
 env:
-  rack-sdk-version: 2.2.2
+  rack-sdk-version: latest
   rack-plugin-toolchain-dir: /home/build/rack-plugin-toolchain
 
 defaults:
@@ -25,7 +27,7 @@ jobs:
           gitrev=`git rev-parse --short HEAD`
           pluginversion=`jq -r '.version' plugin.json`
           echo "Set plugin version from $pluginversion to $pluginversion-$gitrev"
-          cat <<< `jq --arg VERSION "$pluginversion-nightly-$gitrev" '.version=$VERSION' plugin.json` > plugin.json
+          cat <<< `jq --arg VERSION "$pluginversion-$gitrev" '.version=$VERSION' plugin.json` > plugin.json
         # only modify plugin version if no tag was created
         if: "! startsWith(github.ref, 'refs/tags/v')"
 
@@ -37,7 +39,6 @@ jobs:
       image: ghcr.io/qno/rack-plugin-toolchain
       options: --user root
     strategy:
-      fail-fast: false
       matrix:
         platform: [win-x64, linux-x64, mac-x64, mac-arm64]
     steps:
@@ -80,7 +81,7 @@ jobs:
       - name: Get Rack-SDK
         run: |
           pushd $HOME
-          curl -o Rack-SDK.zip https://vcvrack.com/downloads/Rack-SDK-${{ env.rack-sdk-version }}-mac-${{ matrix.platform }}.zip
+          wget -O Rack-SDK.zip https://vcvrack.com/downloads/Rack-SDK-${{ env.rack-sdk-version }}-mac-${{ matrix.platform }}.zip
           unzip Rack-SDK.zip
       - name: Build plugin
         run: |
diff --git a/RackSDK.cmake b/RackSDK.cmake
index 175a5c51..b884b53c 100644
--- a/RackSDK.cmake
+++ b/RackSDK.cmake
@@ -1,6 +1,6 @@
 # Mapping of plugin build definitions from the Rack-SDK arch.mk, compile.mk, dep.mk and plugin.mk to CMake.
 
-set(RACK_SDK_VERSION 2.2.2)
+set(RACK_SDK_VERSION 2.4.0)
 message(STATUS "Load RackSDK.cmake (mapping based on Rack-SDK-${RACK_SDK_VERSION})")
 
 if ("${RACK_SDK_DIR}" STREQUAL "")
@@ -24,10 +24,7 @@ if ("${ADDITIONAL_PLUGIN_DISTRIBUTABLES}" STREQUAL "")
 endif ()
 
 # Do not change the RACK_PLUGIN_LIB!
-if (${CMAKE_OSX_ARCHITECTURES} MATCHES "arm64")
-  set(RACK_PLUGIN_ARCH -arm64)
-endif ()
-set(RACK_PLUGIN_LIB plugin${RACK_PLUGIN_ARCH})
+set(RACK_PLUGIN_LIB plugin)
 
 file(GLOB LICENSE LICENSE*)
 set(PLUGIN_DISTRIBUTABLES plugin.json res ${LICENSE} ${ADDITIONAL_PLUGIN_DISTRIBUTABLES})