Skip to content

Commit

Permalink
update toolchain and RackSDK.cmake
Browse files Browse the repository at this point in the history
  • Loading branch information
qno authored Nov 14, 2023
1 parent 01d87df commit d8e3df2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/build-plugin.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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')"
Expand All @@ -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:
Expand Down Expand Up @@ -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: |
Expand Down
7 changes: 2 additions & 5 deletions RackSDK.cmake
Original file line number Diff line number Diff line change
@@ -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 "")
Expand All @@ -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})
Expand Down

0 comments on commit d8e3df2

Please sign in to comment.