From 4f5554754f02a115ef71ef96a70153235a101f17 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Wed, 11 Jan 2023 10:18:43 +0100 Subject: [PATCH] fix build action when run without sign --- .github/workflows/BuildMeshLab.yml | 6 ++++-- scripts/Windows/2_deploy.sh | 6 ++++-- scripts/macOS/2_deploy.sh | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/BuildMeshLab.yml b/.github/workflows/BuildMeshLab.yml index 33616474e..73b1b32c7 100644 --- a/.github/workflows/BuildMeshLab.yml +++ b/.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 }}' diff --git a/scripts/Windows/2_deploy.sh b/scripts/Windows/2_deploy.sh index 5a2cffb3c..515a70098 100644 --- a/scripts/Windows/2_deploy.sh +++ b/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 ;; *) diff --git a/scripts/macOS/2_deploy.sh b/scripts/macOS/2_deploy.sh index cd3ad26b8..b3a3a791a 100755 --- a/scripts/macOS/2_deploy.sh +++ b/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 ;; *)