Remove conditionals for now

This commit is contained in:
Luis Ángel San Martín 2022-09-16 08:36:04 +02:00
parent ba52739d2e
commit 9e95db99e5
2 changed files with 10 additions and 14 deletions

View File

@ -12,7 +12,6 @@ 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(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'
@ -41,12 +40,11 @@ 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(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'
- 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

View File

@ -12,7 +12,6 @@ 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(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'
@ -41,12 +40,11 @@ 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(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'
- 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