From 9cb8fa34b1dd303f928bf6448b37662ec1f74173 Mon Sep 17 00:00:00 2001 From: Alessandro Muntoni Date: Fri, 23 Jun 2023 12:29:16 +0200 Subject: [PATCH] move win certificate on composite action --- .github/actions/0_setup/action.yml | 19 +++++++++++++++++++ .github/workflows/BuildMeshLab.yml | 12 +----------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/.github/actions/0_setup/action.yml b/.github/actions/0_setup/action.yml index a0e8c13fa..fcef22fdc 100644 --- a/.github/actions/0_setup/action.yml +++ b/.github/actions/0_setup/action.yml @@ -9,6 +9,14 @@ inputs: mac-certificate-pssw: description: 'MacOS Certificate Password' required: false + win-certificate: + description: 'Windows Certificate' + required: false + default: '' + qt-version: + description: 'Qt Version' + required: false + default: '5.15.2' runs: using: "composite" @@ -21,3 +29,14 @@ runs: with: p12-file-base64: ${{ inputs.mac-certificate }} p12-password: ${{ inputs.mac-certificate-pssw }} + - name: Set CodeSign Certificate Windows + if: ${{ runner.os == 'Windows' && inputs.win-certificate != '' }} + run: | + New-Item -ItemType directory -Path certificate + Set-Content -Path certificate\certificate.txt -Value '${{ inputs.win-certificate }}' + certutil -decode certificate\certificate.txt certificate\certificate.pfx + - name: Install Qt + uses: jurplel/install-qt-action@v3 + with: + cache: true + version: ${{ inputs.qt-version }} diff --git a/.github/workflows/BuildMeshLab.yml b/.github/workflows/BuildMeshLab.yml index e25291df9..17ee9f5ee 100644 --- a/.github/workflows/BuildMeshLab.yml +++ b/.github/workflows/BuildMeshLab.yml @@ -27,17 +27,7 @@ jobs: with: mac-certificate: ${{ secrets.MACOS_CERTIFICATE }} mac-certificate-pssw: ${{ secrets.MACOS_CERTIFICATE_PSSW }} - - name: Set CodeSign Certificate 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 }}' - certutil -decode certificate\certificate.txt certificate\certificate.pfx - - name: Install Qt - uses: jurplel/install-qt-action@v3 - with: - cache: true - version: ${{ env.QT_VERSION }} + win-certificate: ${{ secrets.WIN_CERTIFICATE }} - name: Install dependencies shell: bash run: |