From 8f2ec3b197f4c07d6550cc1559f450484f22b209 Mon Sep 17 00:00:00 2001 From: Erwin de Haan Date: Tue, 17 Sep 2019 16:23:27 +0200 Subject: [PATCH 1/3] Add submodule update to build. --- .ci/azure-pipelines.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml index 6417d500df..8ceee36757 100644 --- a/.ci/azure-pipelines.yml +++ b/.ci/azure-pipelines.yml @@ -28,7 +28,13 @@ jobs: - checkout: self clean: true submodules: true - persistCredentials: false + persistCredentials: true + + - task: CmdLine@2 + displayName: "Update submodules" + inputs: + script: 'git submodule update --recursive --remote' + workingDirectory: '$(Build.SourcesDirectory)' - task: DotNetCoreCLI@2 displayName: Publish @@ -87,7 +93,13 @@ jobs: - checkout: self clean: true submodules: true - persistCredentials: false + persistCredentials: true + + - task: CmdLine@2 + displayName: "Update submodules" + inputs: + script: 'git submodule update --recursive --remote' + workingDirectory: '$(Build.SourcesDirectory)' - task: CmdLine@2 displayName: Clone the UX repository From 8b438b68ccfb623fcc1cd1af715944481f01ad5c Mon Sep 17 00:00:00 2001 From: Erwin de Haan Date: Tue, 17 Sep 2019 16:40:11 +0200 Subject: [PATCH 2/3] Added Better submodule updates. --- .ci/azure-pipelines.yml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml index 8ceee36757..e124647f3c 100644 --- a/.ci/azure-pipelines.yml +++ b/.ci/azure-pipelines.yml @@ -32,8 +32,16 @@ jobs: - task: CmdLine@2 displayName: "Update submodules" + condition: and(succeeded(), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release-'), eq(variables['Build.SourceBranch'], 'refs/heads/master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'BuildCompletion')) inputs: - script: 'git submodule update --recursive --remote' + script: 'git submodule foreach --recursive git checkout $(Build.SourceBranch)' + workingDirectory: '$(Build.SourcesDirectory)' + + - task: CmdLine@2 + displayName: "Update submodules (PR)" + condition: and(succeeded(), or(startsWith(variables['System.PullRequest.TargetBranch'], 'refs/heads/release-'), eq(variables['System.PullRequest.TargetBranch'], 'refs/heads/master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'PullRequest')) + inputs: + script: 'git submodule foreach --recursive git checkout $(System.PullRequest.TargetBranch)' workingDirectory: '$(Build.SourcesDirectory)' - task: DotNetCoreCLI@2 @@ -97,8 +105,16 @@ jobs: - task: CmdLine@2 displayName: "Update submodules" + condition: and(succeeded(), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release-'), eq(variables['Build.SourceBranch'], 'refs/heads/master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'BuildCompletion')) inputs: - script: 'git submodule update --recursive --remote' + script: 'git submodule foreach --recursive git checkout $(Build.SourceBranch)' + workingDirectory: '$(Build.SourcesDirectory)' + + - task: CmdLine@2 + displayName: "Update submodules (PR)" + condition: and(succeeded(), or(startsWith(variables['System.PullRequest.TargetBranch'], 'refs/heads/release-'), eq(variables['System.PullRequest.TargetBranch'], 'refs/heads/master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'PullRequest')) + inputs: + script: 'git submodule foreach --recursive git checkout $(System.PullRequest.TargetBranch)' workingDirectory: '$(Build.SourcesDirectory)' - task: CmdLine@2 From f8fed4922539d39eedb4c8907ce0d4fe13487b2a Mon Sep 17 00:00:00 2001 From: Erwin de Haan Date: Tue, 17 Sep 2019 16:45:18 +0200 Subject: [PATCH 3/3] Another condition update. --- .ci/azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml index e124647f3c..c58cb7a38d 100644 --- a/.ci/azure-pipelines.yml +++ b/.ci/azure-pipelines.yml @@ -32,14 +32,14 @@ jobs: - task: CmdLine@2 displayName: "Update submodules" - condition: and(succeeded(), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release-'), eq(variables['Build.SourceBranch'], 'refs/heads/master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'BuildCompletion')) + condition: and(succeeded(), or(contains(variables['Build.SourceBranch'], 'release'), contains(variables['Build.SourceBranch'], 'master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'BuildCompletion')) inputs: script: 'git submodule foreach --recursive git checkout $(Build.SourceBranch)' workingDirectory: '$(Build.SourcesDirectory)' - task: CmdLine@2 displayName: "Update submodules (PR)" - condition: and(succeeded(), or(startsWith(variables['System.PullRequest.TargetBranch'], 'refs/heads/release-'), eq(variables['System.PullRequest.TargetBranch'], 'refs/heads/master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'PullRequest')) + condition: and(succeeded(), or(contains(variables['System.PullRequest.TargetBranch'], 'release'), contains(variables['System.PullRequest.TargetBranch'], 'master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'PullRequest')) inputs: script: 'git submodule foreach --recursive git checkout $(System.PullRequest.TargetBranch)' workingDirectory: '$(Build.SourcesDirectory)' @@ -105,14 +105,14 @@ jobs: - task: CmdLine@2 displayName: "Update submodules" - condition: and(succeeded(), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release-'), eq(variables['Build.SourceBranch'], 'refs/heads/master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'BuildCompletion')) + condition: and(succeeded(), or(contains(variables['Build.SourceBranch'], 'release'), contains(variables['Build.SourceBranch'], 'master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'BuildCompletion')) inputs: script: 'git submodule foreach --recursive git checkout $(Build.SourceBranch)' workingDirectory: '$(Build.SourcesDirectory)' - task: CmdLine@2 displayName: "Update submodules (PR)" - condition: and(succeeded(), or(startsWith(variables['System.PullRequest.TargetBranch'], 'refs/heads/release-'), eq(variables['System.PullRequest.TargetBranch'], 'refs/heads/master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'PullRequest')) + condition: and(succeeded(), or(contains(variables['System.PullRequest.TargetBranch'], 'release'), contains(variables['System.PullRequest.TargetBranch'], 'master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'PullRequest')) inputs: script: 'git submodule foreach --recursive git checkout $(System.PullRequest.TargetBranch)' workingDirectory: '$(Build.SourcesDirectory)'