Merge pull request #2184 from plugdata-team/develop

Merge develop into main

Author: timothyschoen

.github/scripts/generate-upload-info.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+git config --global --add safe.directory /__w/plugdata/plugdata
+
+FILE=$1
+INFO_FILE=${FILE}.txt
+GIT_HASH=$(git log -1 --format=%H)
+DATE=$(date -u +"%d-%m-%y %H:%M UTC")
+
+cat > $INFO_FILE <<END_FILE
+$DATE
+$GIT_HASH
+END_FILE
+
+exit 0

.github/scripts/package-Linux.sh

@@ -6,7 +6,7 @@ cp -r Plugins plugdata
 cp README.md plugdata/README.md
 cp LICENSE plugdata/LICENSE.txt
 
-# Create tar.gz with unique name for each distro
-tar -czvf plugdata-$1.tar.gz plugdata
-
+# Create tar.xz with unique name for each distro
+tar -cvf - plugdata | xz -9 > $1
 
+.github/scripts/generate-upload-info.sh $1

.github/scripts/package-Windows.sh

@@ -1,11 +1,10 @@
-X64BitMode=""
+VERSION=0.9.2
 
-if [[ $1 == "x64" ]]; then
+X64BitMode=""
+if [[ $1 == "plugdata-Win64.msi" ]]; then
   X64BitMode="x64"
 fi
 
-VERSION=0.9.1
-
 rm -f ./plugdata.wxs
 cat > ./plugdata.wxs <<-EOL
 <?xml version="1.0"?>
@@ -173,7 +172,6 @@ cat > ./plugdata.wxs <<-EOL
 </Wix>
 EOL
 
-
 if [[ $X64BitMode == "x64" ]]; then
 "C:/Program Files (x86)/WiX Toolset v3.14/bin/candle" -arch x64 plugdata.wxs
 "C:/Program Files (x86)/WiX Toolset v3.14/bin/light" plugdata.wixobj -out plugdata-Installer.msi -ext WixUIExtension
@@ -184,6 +182,8 @@ else
 cp ".\plugdata-Installer.msi" ".\plugdata-Win32.msi"
 fi
 
+.github/scripts/generate-upload-info.sh $1
+
 # - Codesign Installer for Windows 8+
 # -"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin\signtool.exe" sign /f "XXXXX.p12" /p XXXXX /d "plugdata Installer" ".\installer\plugdata Installer.exe"
 

.github/scripts/package-macOS.sh

@@ -155,14 +155,16 @@ rm -r $PKG_DIR
 if [ -z "$AC_USERNAME" ]; then
     echo "No user name, skipping sign/notarize"
     # pretend that we signed the package and bail out
-    mv ${PRODUCT_NAME}.pkg ${PRODUCT_NAME}-MacOS-$1.pkg
+    mv ${PRODUCT_NAME}.pkg $1
     exit 0
 fi
 
 # Sign installer
-productsign -s "Developer ID Installer: Timothy Schoen (7SV7JPRR2L)" ${PRODUCT_NAME}.pkg ${PRODUCT_NAME}-MacOS-$1.pkg
+productsign -s "Developer ID Installer: Timothy Schoen (7SV7JPRR2L)" ${PRODUCT_NAME}.pkg $1
 
 # Notarize installer
 xcrun notarytool store-credentials "notary_login" --apple-id ${AC_USERNAME} --password ${AC_PASSWORD} --team-id "7SV7JPRR2L"
-xcrun notarytool submit ./plugdata-MacOS-$1.pkg --keychain-profile "notary_login" --wait
+xcrun notarytool submit $1 --keychain-profile "notary_login" --wait
 xcrun stapler staple "plugdata-MacOS-$1.pkg"
+
+.github/scripts/generate-upload-info.sh $1