diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 00e9bfc8..f9f0a2ef 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -97,69 +97,70 @@ stages: artifactType: Container parallel: true - - job: Linux - pool: - vmImage: ubuntu-20.04 - variables: - - name: _SignType - value: none - - name: MSBUILDDISABLENODEREUSE - value: 1 - - ${{ if and(eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - name: _OfficialBuildArgs - value: -p:OfficialBuildId=$(Build.BuildNumber) - # else - - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - - name: _OfficialBuildArgs - value: '' - steps: - - checkout: self - clean: true - - script: eng/common/cibuild.sh - --configuration $(_BuildConfig) - --prepareMachine - displayName: Build - - task: PublishBuildArtifacts@1 - displayName: Upload TestResults - condition: always() - continueOnError: true - inputs: - pathtoPublish: artifacts/TestResults/$(_BuildConfig)/ - artifactName: $(Agent.Os)_$(Agent.JobName) TestResults - artifactType: Container - parallel: true + - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + - job: Linux + pool: + vmImage: ubuntu-20.04 + variables: + - name: _SignType + value: none + - name: MSBUILDDISABLENODEREUSE + value: 1 + - ${{ if and(eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: _OfficialBuildArgs + value: -p:OfficialBuildId=$(Build.BuildNumber) + # else + - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + - name: _OfficialBuildArgs + value: '' + steps: + - checkout: self + clean: true + - script: eng/common/cibuild.sh + --configuration $(_BuildConfig) + --prepareMachine + displayName: Build + - task: PublishBuildArtifacts@1 + displayName: Upload TestResults + condition: always() + continueOnError: true + inputs: + pathtoPublish: artifacts/TestResults/$(_BuildConfig)/ + artifactName: $(Agent.Os)_$(Agent.JobName) TestResults + artifactType: Container + parallel: true - - job: Mac - pool: - vmImage: macOS-11 - variables: - - name: _SignType - value: none - - name: MSBUILDDISABLENODEREUSE - value: 1 - - ${{ if and(eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - name: _OfficialBuildArgs - value: -p:OfficialBuildId=$(Build.BuildNumber) - # else - - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - - name: _OfficialBuildArgs - value: '' - steps: - - checkout: self - clean: true - - script: eng/common/cibuild.sh - --configuration $(_BuildConfig) - --prepareMachine - displayName: Build - - task: PublishBuildArtifacts@1 - displayName: Upload TestResults - condition: always() - continueOnError: true - inputs: - pathtoPublish: artifacts/TestResults/$(_BuildConfig)/ - artifactName: $(Agent.Os)_$(Agent.JobName) TestResults - artifactType: Container - parallel: true + - job: Mac + pool: + vmImage: macOS-11 + variables: + - name: _SignType + value: none + - name: MSBUILDDISABLENODEREUSE + value: 1 + - ${{ if and(eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: _OfficialBuildArgs + value: -p:OfficialBuildId=$(Build.BuildNumber) + # else + - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + - name: _OfficialBuildArgs + value: '' + steps: + - checkout: self + clean: true + - script: eng/common/cibuild.sh + --configuration $(_BuildConfig) + --prepareMachine + displayName: Build + - task: PublishBuildArtifacts@1 + displayName: Upload TestResults + condition: always() + continueOnError: true + inputs: + pathtoPublish: artifacts/TestResults/$(_BuildConfig)/ + artifactName: $(Agent.Os)_$(Agent.JobName) TestResults + artifactType: Container + parallel: true - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: eng\common\templates\post-build\post-build.yml