mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-14 02:54:46 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Codesign only on master/develop and pull requests

Browse Source
This commit is contained in:
Luis Ángel San Martín
2022-09-16 10:28:20 +02:00
parent 9e95db99e5
commit 4fad04c441
5 changed files with 59 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
azure-pipelines-windows-template-qt6.yml
View File

@ -12,6 +12,7 @@ jobs:
- job: ${{ parameters.name }} - job: ${{ parameters.name }}
dependsOn: CodeFormatValidation dependsOn: CodeFormatValidation
variables: variables:
- ${{ if and(eq(variables['System.TeamFoundationCollectionUri'], 'https://dev.azure.com/luisangelsm/'), or(contains(variables['Build.SourceBranch'], 'merge'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['Build.SourceBranch'], 'refs/heads/develop'))) }}:
- group: windows-codesign - group: windows-codesign
pool: pool:
vmImage: 'windows-2019' vmImage: 'windows-2019'
@ -40,18 +41,26 @@ jobs:
set PATH=C:\Qt\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin;%PATH% set PATH=C:\Qt\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin;%PATH%
nmake check TESTARGS="-maxwarnings 100000" nmake check TESTARGS="-maxwarnings 100000"
displayName: 'Run tests' displayName: 'Run tests'
- ${{ if and(eq(variables['System.TeamFoundationCollectionUri'], 'https://dev.azure.com/luisangelsm/'), or(contains(variables['Build.SourceBranch'], 'merge'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['Build.SourceBranch'], 'refs/heads/develop'))) }}:
- task: DownloadSecureFile@1 - task: DownloadSecureFile@1
name: pfxFile name: pfxFile
displayName: 'Get the pfx file certificate' displayName: 'Get the pfx file certificate'
inputs: inputs:
secureFile: 'certificate.pfx' secureFile: 'certificate.pfx'
- ${{ if and(eq(variables['System.TeamFoundationCollectionUri'], 'https://dev.azure.com/luisangelsm/'), or(contains(variables['Build.SourceBranch'], 'merge'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['Build.SourceBranch'], 'refs/heads/develop'))) }}:
- script: | - script: |
set PATH=C:\Qt\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin;%PATH% set PATH=C:\Qt\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin;%PATH%
cd $(Build.SourcesDirectory)\ci\win cd $(Build.SourcesDirectory)\ci\win
.\create_installer.cmd ${{ parameters.architecture }} 7z $(Build.BuildNumber) qt6 $(Agent.TempDirectory)\certificate.pfx %PASSWORD% .\create_installer.cmd ${{ parameters.architecture }} 7z $(Build.BuildNumber) qt6 $(pfxFile.secureFilePath) %PASSWORD%
env: env:
PASSWORD: $(pfxPassword) PASSWORD: $(pfxPassword)
displayName: 'Create installer' displayName: 'Create installer'
- ${{ else }}:
- script: |
set PATH=C:\Qt\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin;%PATH%
cd $(Build.SourcesDirectory)\ci\win
.\create_installer.cmd ${{ parameters.architecture }} 7z $(Build.BuildNumber) qt6
displayName: 'Create installer'
- task: CopyFiles@2 - task: CopyFiles@2
inputs: inputs:
sourceFolder: $(Build.SourcesDirectory)\ci\win\Output\ sourceFolder: $(Build.SourcesDirectory)\ci\win\Output\

11
azure-pipelines-windows-template.yml
View File

@ -12,6 +12,7 @@ jobs:
- job: ${{ parameters.name }} - job: ${{ parameters.name }}
dependsOn: CodeFormatValidation dependsOn: CodeFormatValidation
variables: variables:
- ${{ if and(eq(variables['System.TeamFoundationCollectionUri'], 'https://dev.azure.com/luisangelsm/'), or(contains(variables['Build.SourceBranch'], 'merge'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['Build.SourceBranch'], 'refs/heads/develop'))) }}:
- group: windows-codesign - group: windows-codesign
pool: pool:
vmImage: 'windows-2019' vmImage: 'windows-2019'
@ -40,18 +41,26 @@ jobs:
set PATH=C:\Qt\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin;%PATH% set PATH=C:\Qt\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin;%PATH%
nmake check TESTARGS="-maxwarnings 100000" nmake check TESTARGS="-maxwarnings 100000"
displayName: 'Run tests' displayName: 'Run tests'
- ${{ if and(eq(variables['System.TeamFoundationCollectionUri'], 'https://dev.azure.com/luisangelsm/'), or(contains(variables['Build.SourceBranch'], 'merge'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['Build.SourceBranch'], 'refs/heads/develop'))) }}:
- task: DownloadSecureFile@1 - task: DownloadSecureFile@1
name: pfxFile name: pfxFile
displayName: 'Get the pfx file certificate' displayName: 'Get the pfx file certificate'
inputs: inputs:
secureFile: 'certificate.pfx' secureFile: 'certificate.pfx'
- ${{ if and(eq(variables['System.TeamFoundationCollectionUri'], 'https://dev.azure.com/luisangelsm/'), or(contains(variables['Build.SourceBranch'], 'merge'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['Build.SourceBranch'], 'refs/heads/develop'))) }}:
- script: | - script: |
set PATH=C:\Qt\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin;%PATH% set PATH=C:\Qt\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin;%PATH%
cd $(Build.SourcesDirectory)\ci\win cd $(Build.SourcesDirectory)\ci\win
.\create_installer.cmd ${{ parameters.architecture }} 7z $(Build.BuildNumber) qt5 $(Agent.TempDirectory)\certificate.pfx %PASSWORD% .\create_installer.cmd ${{ parameters.architecture }} 7z $(Build.BuildNumber) qt5 $(pfxFile.secureFilePath) %PASSWORD%
env: env:
PASSWORD: $(pfxPassword) PASSWORD: $(pfxPassword)
displayName: 'Create installer' displayName: 'Create installer'
- ${{ else }}:
- script: |
set PATH=C:\Qt\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin;%PATH%
cd $(Build.SourcesDirectory)\ci\win
.\create_installer.cmd ${{ parameters.architecture }} 7z $(Build.BuildNumber) qt5
displayName: 'Create installer'
- task: CopyFiles@2 - task: CopyFiles@2
inputs: inputs:
sourceFolder: $(Build.SourcesDirectory)\ci\win\Output\ sourceFolder: $(Build.SourcesDirectory)\ci\win\Output\

2
ci/win/build_installer.iss
View File

@ -15,7 +15,9 @@ SetupIconFile=setup.ico
UninstallDisplayIcon=uninstall.ico UninstallDisplayIcon=uninstall.ico
ArchitecturesInstallIn64BitMode=x64 ArchitecturesInstallIn64BitMode=x64
ArchitecturesAllowed=x64 ArchitecturesAllowed=x64
#if CODE_SIGN == "true"
SignTool=signtool SignTool=signtool
#endif
[Registry] [Registry]
Root: HKCR; SubKey: .cbz; ValueType: string; ValueData: Comic Book (zip); Flags: uninsdeletekey; Tasks: File_association Root: HKCR; SubKey: .cbz; ValueType: string; ValueData: Comic Book (zip); Flags: uninsdeletekey; Tasks: File_association

2
ci/win/build_installer_qt6.iss
View File

@ -15,7 +15,9 @@ SetupIconFile=setup.ico
UninstallDisplayIcon=uninstall.ico UninstallDisplayIcon=uninstall.ico
ArchitecturesInstallIn64BitMode=x64 ArchitecturesInstallIn64BitMode=x64
ArchitecturesAllowed=x64 ArchitecturesAllowed=x64
#if CODE_SIGN == "true"
SignTool=signtool SignTool=signtool
#endif
[Registry] [Registry]
Root: HKCR; SubKey: .cbz; ValueType: string; ValueData: Comic Book (zip); Flags: uninsdeletekey; Tasks: File_association Root: HKCR; SubKey: .cbz; ValueType: string; ValueData: Comic Book (zip); Flags: uninsdeletekey; Tasks: File_association

12
ci/win/create_installer.cmd
View File

@ -59,10 +59,18 @@ if "%1"=="x86" (
) )
echo "iscc start" echo "iscc start"
if "%~5" == "" (
if "%4"=="qt6" ( if "%4"=="qt6" (
iscc /DVERSION=%VERSION% /DPLATFORM=%1 /DCOMPRESSED_ARCHIVE_BACKEND=%2 /DBUILD_NUMBER=%3 build_installer_qt6.iss "/Ssigntool=$qC:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\SignTool.exe$q sign /f %5 /p %6 $f" || exit /b iscc /DVERSION=%VERSION% /DPLATFORM=%1 /DCOMPRESSED_ARCHIVE_BACKEND=%2 /DBUILD_NUMBER=%3 /DCODE_SIGN=false build_installer_qt6.iss || exit /b
) else ( ) else (
iscc /DVERSION=%VERSION% /DPLATFORM=%1 /DCOMPRESSED_ARCHIVE_BACKEND=%2 /DBUILD_NUMBER=%3 build_installer.iss "/Ssigntool=$qC:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\SignTool.exe$q sign /f %5 /p %6 $f" || exit /b iscc /DVERSION=%VERSION% /DPLATFORM=%1 /DCOMPRESSED_ARCHIVE_BACKEND=%2 /DBUILD_NUMBER=%3 /DCODE_SIGN=false build_installer.iss || exit /b
)
) else (
if "%4"=="qt6" (
iscc /DVERSION=%VERSION% /DPLATFORM=%1 /DCOMPRESSED_ARCHIVE_BACKEND=%2 /DBUILD_NUMBER=%3 /DCODE_SIGN=true build_installer_qt6.iss "/Ssigntool=$qC:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\SignTool.exe$q sign /f %5 /p %6 $f" || exit /b
) else (
iscc /DVERSION=%VERSION% /DPLATFORM=%1 /DCOMPRESSED_ARCHIVE_BACKEND=%2 /DBUILD_NUMBER=%3 /DCODE_SIGN=true build_installer.iss "/Ssigntool=$qC:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\SignTool.exe$q sign /f %5 /p %6 $f" || exit /b
)
) )
echo "iscc done!" echo "iscc done!"