Merge in 'release/7.0.1xx' changes
This commit is contained in:
commit
57c054d43e
1 changed files with 1 additions and 6 deletions
|
@ -1,9 +1,6 @@
|
||||||
# Builds a source-build tarball
|
# Builds a source-build tarball
|
||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
# Custom condition to apply to the job
|
|
||||||
condition: true
|
|
||||||
|
|
||||||
# Dependent jobs that must be completed before this job will run
|
# Dependent jobs that must be completed before this job will run
|
||||||
dependsOn:
|
dependsOn:
|
||||||
|
|
||||||
|
@ -30,7 +27,6 @@ jobs:
|
||||||
- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml
|
- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml
|
||||||
parameters:
|
parameters:
|
||||||
architecture: x64
|
architecture: x64
|
||||||
condition: ${{ parameters.condition }}
|
|
||||||
dependsOn: ${{ parameters.dependsOn }}
|
dependsOn: ${{ parameters.dependsOn }}
|
||||||
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
|
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
|
||||||
excludeSdkContentTests: true
|
excludeSdkContentTests: true
|
||||||
|
@ -78,7 +74,6 @@ jobs:
|
||||||
- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml
|
- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml
|
||||||
parameters:
|
parameters:
|
||||||
architecture: arm64
|
architecture: arm64
|
||||||
condition: ${{ parameters.condition }}
|
|
||||||
dependsOn: ${{ parameters.dependsOn }}
|
dependsOn: ${{ parameters.dependsOn }}
|
||||||
${{ if in(variables['Build.Reason'], 'PullRequest') }}:
|
${{ if in(variables['Build.Reason'], 'PullRequest') }}:
|
||||||
excludeSdkContentTests: true
|
excludeSdkContentTests: true
|
||||||
|
@ -100,7 +95,7 @@ jobs:
|
||||||
architecture: x64
|
architecture: x64
|
||||||
# Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status.
|
# Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status.
|
||||||
# The bootstrap build will shortcut if the stage 1 build failed.
|
# The bootstrap build will shortcut if the stage 1 build failed.
|
||||||
condition: and(${{ parameters.condition }}, succeededOrFailed())
|
condition: succeededOrFailed()
|
||||||
dependsOn: Build_Tarball_x64
|
dependsOn: Build_Tarball_x64
|
||||||
excludeSdkContentTests: true
|
excludeSdkContentTests: true
|
||||||
installerBuildResourceId: ${{ parameters.installerBuildResourceId }}
|
installerBuildResourceId: ${{ parameters.installerBuildResourceId }}
|
||||||
|
|
Loading…
Add table
Reference in a new issue