From e6006810e00aa90b349116edb63df299882a5c9b Mon Sep 17 00:00:00 2001 From: Levin Li Date: Tue, 7 Mar 2023 10:20:21 +0800 Subject: [PATCH] Pull target branch --- azure-pipelines.yml | 3 ++- jobs/build.yml | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 319c8200..903d7b31 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,7 +17,8 @@ trigger: branches: include: - releases/* - - master + - main + - develop pool: vmImage: 'macos-latest' diff --git a/jobs/build.yml b/jobs/build.yml index fad8a46c..a437c727 100644 --- a/jobs/build.yml +++ b/jobs/build.yml @@ -12,7 +12,6 @@ jobs: - checkout: CelestiaContent fetchDepth: 1 - checkout: CelestiaLocalization - fetchDepth: 1 - checkout: self submodules: true @@ -33,6 +32,8 @@ jobs: cd Celestia git checkout origin/$(Build.SourceBranchName) git submodule update --init thirdparty/miniaudio + cd ../CelestiaLocalization + git checkout origin/$(Build.SourceBranchName) displayName: 'Checkout Branch' condition: ne( variables['Build.Reason'], 'PullRequest' ) @@ -40,6 +41,8 @@ jobs: cd Celestia git checkout origin/$(System.PullRequest.TargetBranch) git submodule update --init thirdparty/miniaudio + cd ../CelestiaLocalization + git checkout origin/$(System.PullRequest.TargetBranch) displayName: 'Checkout Branch (PR)' condition: eq( variables['Build.Reason'], 'PullRequest' )