From f899790042a9143959acf7747142b637fe1bcbc3 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sat, 23 Apr 2022 12:46:59 -0500 Subject: [PATCH] =?UTF-8?q?revert(web):=20=E2=AC=85=EF=B8=8F=20restore=20m?= =?UTF-8?q?aster=20->=20main=20ren?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/azure-pipelines.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/azure-pipelines.yaml b/web/azure-pipelines.yaml index eed420f34..fbc78f85b 100644 --- a/web/azure-pipelines.yaml +++ b/web/azure-pipelines.yaml @@ -1,7 +1,7 @@ trigger: batch: false branches: - include: [master] + include: [main] paths: include: [ @@ -13,7 +13,7 @@ trigger: pr: autoCancel: false branches: - include: [master] + include: [main] paths: include: [ @@ -54,7 +54,7 @@ steps: $(Build.BuildId) env: DOCKER_BUILDKIT: 1 - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')) + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) - task: CopyFiles@2 displayName: stage docker-compose files @@ -64,7 +64,7 @@ steps: docker-compose.yml docker-compose.prod.yml TargetFolder: $(Build.ArtifactStagingDirectory) - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')) + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) - task: PublishBuildArtifacts@1 displayName: publish docker-compose files @@ -72,4 +72,4 @@ steps: PathtoPublish: $(Build.ArtifactStagingDirectory) ArtifactName: drop publishLocation: Container - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')) + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))