diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4a28570..734e9ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,9 @@ jobs: uses: actions/checkout@v7 - name: Setup Processing id: setup-processing - uses: pr1metine/setup-processing@v2.1.0 + uses: pr1metine/setup-processing@v2.2.0 + env: + ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true - name: Install Processing libs run: | sudo apt install wget curl -y @@ -24,7 +26,7 @@ jobs: unzip -d ${{steps.setup-processing.outputs.install-dir}}/modes/java/libraries v* sudo mv ${{steps.setup-processing.outputs.install-dir}}/modes/java/libraries/ddf-Minim-* ${{steps.setup-processing.outputs.install-dir}}/modes/java/libraries/minim - name: Linux build - run: processing-java --sketch=./MusicBeam --output=./output --force --export + run: processing cli --sketch=./MusicBeam --output=./output --force --export - name: Upload Linux Build uses: actions/upload-artifact@v7 with: @@ -38,7 +40,9 @@ jobs: uses: actions/checkout@v7 - name: Setup Processing id: setup-processing - uses: pr1metine/setup-processing@v2.1.0 + uses: pr1metine/setup-processing@v2.2.0 + env: + ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true - name: Install Processing libs run: | sudo apt install wget curl -y @@ -48,7 +52,7 @@ jobs: unzip -d ${{steps.setup-processing.outputs.install-dir}}/modes/java/libraries v* sudo mv ${{steps.setup-processing.outputs.install-dir}}/modes/java/libraries/ddf-Minim-* ${{steps.setup-processing.outputs.install-dir}}/modes/java/libraries/minim - name: Windows build - run: processing-java --sketch=./MusicBeam --output=./output --variant=windows-amd64 --force --export + run: processing cli --sketch=./MusicBeam --output=./output --variant=windows-amd64 --force --export - name: Upload Windows Build uses: actions/upload-artifact@v7 with: diff --git a/Makefile b/Makefile index 08f9fb1..8efb49a 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ BASE_DIR := $(shell pwd) BUILD_DIR := $(BASE_DIR)/MusicBeam SOURCE_DIR := $(BASE_DIR)/MusicBeam -ARCHS = linux-aarch64 linux-amd64 linux-arm macos-aarch64 macos-x86_64 windows-amd64 +ARCHS = linux-aarch64 linux-amd64 linux-arm windows-amd64 ZIPS = $(ARCHS:%=$(BUILD_DIR)/MusicBeam-%.zip) .PHONY: all clean @@ -14,12 +14,6 @@ $(BUILD_DIR)/MusicBeam-%.zip: (cd "$(SOURCE_DIR)/$(*)" && zip -r "$(BUILD_DIR)/MusicBeam-$(*).zip" ./*) zip "$(BUILD_DIR)/MusicBeam-$(*).zip" LICENSE README.md -$(BUILD_DIR)/MusicBeam-macos-aarch64.zip: - cp "$(SOURCE_DIR)/sketch.icns" "$(SOURCE_DIR)/macos-aarch64/MusicBeam.app/Contents/Resources/sketch.icns" - codesign --force --sign - "$(SOURCE_DIR)/macos-aarch64/MusicBeam.app" - (cd "$(SOURCE_DIR)/macos-aarch64" && zip -r "$(BUILD_DIR)/MusicBeam-macos-aarch64.zip" ./*) - zip "$(BUILD_DIR)/MusicBeam-macos-aarch64.zip" LICENSE README.md - $(BUILD_DIR)/MusicBeam-macos-x86_64.zip: cp "$(SOURCE_DIR)/sketch.icns" "$(SOURCE_DIR)/macos-x86_64/MusicBeam.app/Contents/Resources/sketch.icns" codesign --force --sign - "$(SOURCE_DIR)/macos-x86_64/MusicBeam.app"