Merge branch 'main' into meshlab-780-fix-crash-when-closing-project-window

.github/workflows/BuildMeshLab.yml

@@ -5,6 +5,8 @@ on:
 
 env:
   QT_VERSION: 5.15.2
+  MAC_CERT: ${{secrets.MACOS_CERT_ID}}
+  WIN_CERT: ${{secrets.WIN_CERTIFICATE}}
 
 jobs:
   meshlab_build:
@@ -22,13 +24,13 @@ jobs:
     - name: Setup MSVC
       uses: ilammy/msvc-dev-cmd@v1
     - name: Set CodeSign Certificate macOS
-      if: runner.os == 'macOS'
+      if: runner.os == 'macOS' && env.MAC_CERT != null
       uses: apple-actions/import-codesign-certs@v1
       with:
         p12-file-base64: ${{ secrets.MACOS_CERTIFICATE }}
         p12-password: ${{ secrets.MACOS_CERTIFICATE_PSSW }}
     - name: Set CodeSign Certificate Windows
-      if: runner.os == 'Windows'
+      if: runner.os == 'Windows' && env.WIN_CERT != null
       run: |
         New-Item -ItemType directory -Path certificate
         Set-Content -Path certificate\certificate.txt -Value '${{ secrets.WIN_CERTIFICATE }}'

scripts/Windows/2_deploy.sh

@@ -30,8 +30,10 @@ case $i in
         shift # past argument=value
         ;;
     -cp=*|--cert_pssw=*)
-        SIGN=true
-        CERT_PSSW="${i#*=}"
+        if [ -z "${i#*=}" ]; then
+            SIGN=true
+            CERT_PSSW="${i#*=}"
+        fi
         shift # past argument=value
         ;;
     *)

scripts/macOS/2_deploy.sh

@@ -25,8 +25,10 @@ case $i in
         shift # past argument=value
         ;;
     -ci=*|--cert_id=*)
-        SIGN=true
-        CERT_ID="${i#*=}"
+        if [ -z "${i#*=}" ]; then
+            SIGN=true
+            CERT_ID="${i#*=}"
+        fi
         shift # past argument=value
         ;;
     *)