From f02d563e7881a3ac64f8b4cf0180cc55a1ad7381 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Mon, 16 Aug 2021 13:44:18 -0700 Subject: [PATCH 1/2] Update buildAndPackage.yml for Azure Pipelines --- .azure-pipelines/buildAndPackage.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.azure-pipelines/buildAndPackage.yml b/.azure-pipelines/buildAndPackage.yml index bb6fae967..c44f1069b 100644 --- a/.azure-pipelines/buildAndPackage.yml +++ b/.azure-pipelines/buildAndPackage.yml @@ -25,7 +25,9 @@ trigger: - settings.gradle - Scripts/* -pr: none +pr: +- dev +- master pool: vmImage: windows-latest From 298437eab98ae7b65f6002bc0c145babcd0b3bdc Mon Sep 17 00:00:00 2001 From: ramsessanchez Date: Mon, 16 Aug 2021 13:54:14 -0700 Subject: [PATCH 2/2] fixed bug on or condtion preventing pipeline from running --- .azure-pipelines/templates/secure-files.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/templates/secure-files.yml b/.azure-pipelines/templates/secure-files.yml index 7e5e716a5..01086fc53 100644 --- a/.azure-pipelines/templates/secure-files.yml +++ b/.azure-pipelines/templates/secure-files.yml @@ -9,7 +9,7 @@ steps: secureFile: 'local.properties' retryCount: '5' -- ${{ if or(eq(parameters.stageID, 'build'), eq(parameters.stageID, 'release') }}: +- ${{ if or(eq(parameters.stageID, 'build'), eq(parameters.stageID, 'release')) }}: - task: DownloadSecureFile@1 inputs: secureFile: 'secring.gpg'