From 9e95db99e5e184e05b195ca5763a33e5bc82c844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Fri, 16 Sep 2022 08:36:04 +0200 Subject: [PATCH] Remove conditionals for now --- azure-pipelines-windows-template-qt6.yml | 12 +++++------- azure-pipelines-windows-template.yml | 12 +++++------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/azure-pipelines-windows-template-qt6.yml b/azure-pipelines-windows-template-qt6.yml index af5b0b20..85b849de 100644 --- a/azure-pipelines-windows-template-qt6.yml +++ b/azure-pipelines-windows-template-qt6.yml @@ -12,7 +12,6 @@ jobs: - job: ${{ parameters.name }} dependsOn: CodeFormatValidation 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 pool: vmImage: 'windows-2019' @@ -41,12 +40,11 @@ jobs: set PATH=C:\Qt\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin;%PATH% nmake check TESTARGS="-maxwarnings 100000" 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 - name: pfxFile - displayName: 'Get the pfx file certificate' - inputs: - secureFile: 'certificate.pfx' + - task: DownloadSecureFile@1 + name: pfxFile + displayName: 'Get the pfx file certificate' + inputs: + secureFile: 'certificate.pfx' - script: | set PATH=C:\Qt\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin;%PATH% cd $(Build.SourcesDirectory)\ci\win diff --git a/azure-pipelines-windows-template.yml b/azure-pipelines-windows-template.yml index 4bdb232b..56e0d4e1 100644 --- a/azure-pipelines-windows-template.yml +++ b/azure-pipelines-windows-template.yml @@ -12,7 +12,6 @@ jobs: - job: ${{ parameters.name }} dependsOn: CodeFormatValidation 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 pool: vmImage: 'windows-2019' @@ -41,12 +40,11 @@ jobs: set PATH=C:\Qt\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin;%PATH% nmake check TESTARGS="-maxwarnings 100000" 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 - name: pfxFile - displayName: 'Get the pfx file certificate' - inputs: - secureFile: 'certificate.pfx' + - task: DownloadSecureFile@1 + name: pfxFile + displayName: 'Get the pfx file certificate' + inputs: + secureFile: 'certificate.pfx' - script: | set PATH=C:\Qt\${{ parameters.qt_version }}\${{ parameters.qt_spec }}\bin;%PATH% cd $(Build.SourcesDirectory)\ci\win