diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a0a5c85c..b3bf326a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -107,13 +107,13 @@ jobs: - name: Sign installer run: | - productsign -s "${{ secrets.APPLE_DEVELOPER_ID_INSTALLER }}" "packaging/build/${{ matrix.project }}.pkg" "bin/${{ matrix.project }}.pkg" - pkgutil --check-signature "bin/${{ matrix.project }}.pkg" + productsign -s "${{ secrets.APPLE_DEVELOPER_ID_INSTALLER }}" "packaging/build/${{ matrix.project }}.pkg" "bin/${{ matrix.project }}-{{ matrix.version }}.pkg" + pkgutil --check-signature "bin/${{ matrix.project }}-{{ matrix.version }}.pkg" - name: Notarize installer uses: lando/notarize-action@v2 with: - product-path: "bin/${{ matrix.project }}.pkg" + product-path: "bin/${{ matrix.project }}-{{ matrix.version }}.pkg" appstore-connect-username: ${{ secrets.APPLE_ID }} appstore-connect-password: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }} appstore-connect-team-id: ${{ secrets.APPLE_TEAM_ID }} @@ -122,10 +122,10 @@ jobs: verbose: true - name: Staple installer - run: xcrun stapler staple "bin/${{ matrix.project }}.pkg" + run: xcrun stapler staple "bin/${{ matrix.project }}-{{ matrix.version }}.pkg" - name: Check installer - run: spctl -a -vvv -t install "bin/${{ matrix.project }}.pkg" + run: spctl -a -vvv -t install "bin/${{ matrix.project }}-{{ matrix.version }}.pkg" - name: Upload Artifact uses: actions/upload-artifact@v3 @@ -175,7 +175,7 @@ jobs: path: "packaging/${{ matrix.project }}.iss" - name: Move installer to bin - run: mv "packaging/build/${{ matrix.project }}.exe" "bin/${{ matrix.project }}.exe" + run: mv "packaging/build/${{ matrix.project }}.exe" "bin/${{ matrix.project }}-{{ matrix.version }}.exe" - name: Upload Artifact uses: actions/upload-artifact@v3 diff --git a/ci/build.sh b/ci/build.sh index 580ea655..a791198e 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -3,6 +3,8 @@ PLUGIN="$1" VERSION="$2" +OUTPUT_NAME="$PLUGIN-$VERSION" + # If we are on the free version, we need to disable the build flag SOSCI_FEATURES if [ "$VERSION" = "free" ]; then # Edit the jucer file to disable the SOSCI_FEATURES flag @@ -18,16 +20,16 @@ if [ "$OS" = "mac" ]; then cd "$ROOT/Builds/$PLUGIN/MacOSX" xcodebuild -configuration Release || exit 1 - cp -R "$ROOT/Builds/$PLUGIN/MacOSX/build/Release/$PLUGIN.app" "$ROOT/ci/bin" - cp -R ~/Library/Audio/Plug-Ins/VST3/$PLUGIN.vst3 "$ROOT/ci/bin" - cp -R ~/Library/Audio/Plug-Ins/Components/$PLUGIN.component "$ROOT/ci/bin" + cp -R "$ROOT/Builds/$PLUGIN/MacOSX/build/Release/$PLUGIN.app" "$ROOT/ci/bin/$OUTPUT_NAME.app" + cp -R ~/Library/Audio/Plug-Ins/VST3/$PLUGIN.vst3 "$ROOT/ci/bin/$OUTPUT_NAME.vst3" + cp -R ~/Library/Audio/Plug-Ins/Components/$PLUGIN.component "$ROOT/ci/bin/$OUTPUT_NAME.component" cd "$ROOT/ci/bin" - zip -r ${PLUGIN}-mac.vst3.zip $PLUGIN.vst3 - zip -r ${PLUGIN}-mac.component.zip $PLUGIN.component - zip -r ${PLUGIN}-mac.app.zip $PLUGIN.app - cp ${PLUGIN}*.zip "$ROOT/bin" + zip -r ${OUTPUT_NAME}-mac.vst3.zip $OUTPUT_NAME.vst3 + zip -r ${OUTPUT_NAME}-mac.component.zip $OUTPUT_NAME.component + zip -r ${OUTPUT_NAME}-mac.app.zip $OUTPUT_NAME.app + cp ${OUTPUT_NAME}*.zip "$ROOT/bin" fi # Build linux version @@ -35,13 +37,14 @@ if [ "$OS" = "linux" ]; then cd "$ROOT/Builds/$PLUGIN/LinuxMakefile" make CONFIG=Release - cp -r ./build/$PLUGIN.vst3 ./build/$PLUGIN "$ROOT/ci/bin" + cp -r ./build/$PLUGIN.vst3 "$ROOT/ci/bin/$OUTPUT_NAME.vst3" + cp -r ./build/$PLUGIN "$ROOT/ci/bin/$OUTPUT_NAME" cd "$ROOT/ci/bin" - zip -r ${PLUGIN}-linux-vst3.zip $PLUGIN.vst3 - zip -r ${PLUGIN}-linux.zip $PLUGIN - cp ${PLUGIN}*.zip "$ROOT/bin" + zip -r ${OUTPUT_NAME}-linux-vst3.zip $OUTPUT_NAME.vst3 + zip -r ${OUTPUT_NAME}-linux.zip $OUTPUT_NAME + cp ${OUTPUT_NAME}*.zip "$ROOT/bin" fi # Build Win version @@ -54,9 +57,9 @@ if [ "$OS" = "win" ]; then cd "$ROOT/Builds/$PLUGIN/VisualStudio2022" "$MSBUILD_EXE" "$PLUGIN.sln" "//p:VisualStudioVersion=16.0" "//m" "//t:Build" "//p:Configuration=Release" "//p:Platform=x64" "//p:PreferredToolArchitecture=x64" "//restore" "//p:RestorePackagesConfig=true" cd "$ROOT/ci/bin" - cp "$ROOT/Builds/$PLUGIN/VisualStudio2022/x64/Release/Standalone Plugin/$PLUGIN.exe" "$ROOT/bin/$PLUGIN-win.exe" - cp "$ROOT/Builds/$PLUGIN/VisualStudio2022/x64/Release/Standalone Plugin/$PLUGIN.pdb" "$ROOT/bin/$PLUGIN-win.pdb" - cp -r "$ROOT/Builds/$PLUGIN/VisualStudio2022/x64/Release/VST3/$PLUGIN.vst3/Contents/x86_64-win/$PLUGIN.vst3" "$ROOT/bin/$PLUGIN-win.vst3" + cp "$ROOT/Builds/$PLUGIN/VisualStudio2022/x64/Release/Standalone Plugin/$PLUGIN.exe" "$ROOT/bin/$OUTPUT_NAME-win.exe" + cp "$ROOT/Builds/$PLUGIN/VisualStudio2022/x64/Release/Standalone Plugin/$PLUGIN.pdb" "$ROOT/bin/$OUTPUT_NAME-win.pdb" + cp -r "$ROOT/Builds/$PLUGIN/VisualStudio2022/x64/Release/VST3/$PLUGIN.vst3/Contents/x86_64-win/$PLUGIN.vst3" "$ROOT/bin/$OUTPUT_NAME-win.vst3" fi cd "$ROOT"