[automated] Merge branch 'release/6.0.4xx' => 'release/8.0.1xx' (#19960)
This commit is contained in:
commit
282c55045f
3 changed files with 17 additions and 6 deletions
15
.github/workflows/inter-branch-merge-flow.yml
vendored
Normal file
15
.github/workflows/inter-branch-merge-flow.yml
vendored
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
name: Inter-branch merge workflow
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- release/**
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
pull-requests: write
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
Merge:
|
||||||
|
uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
|
||||||
|
with:
|
||||||
|
configuration_file_branch: 'release/8.0.4xx'
|
|
@ -110,7 +110,6 @@ extends:
|
||||||
buildArchitecture: x64
|
buildArchitecture: x64
|
||||||
additionalBuildParameters: '/p:PublishInternalAsset=true'
|
additionalBuildParameters: '/p:PublishInternalAsset=true'
|
||||||
runTests: true
|
runTests: true
|
||||||
|
|
||||||
# Linux
|
# Linux
|
||||||
- template: eng/build.yml@self
|
- template: eng/build.yml@self
|
||||||
parameters:
|
parameters:
|
||||||
|
@ -214,7 +213,6 @@ extends:
|
||||||
buildConfiguration: Release
|
buildConfiguration: Release
|
||||||
buildArchitecture: arm64
|
buildArchitecture: arm64
|
||||||
runTests: false
|
runTests: false
|
||||||
|
|
||||||
# Linux
|
# Linux
|
||||||
- template: eng/build.yml@self
|
- template: eng/build.yml@self
|
||||||
parameters:
|
parameters:
|
||||||
|
|
|
@ -54,9 +54,7 @@ stages:
|
||||||
## PR-only jobs
|
## PR-only jobs
|
||||||
|
|
||||||
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
|
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
|
||||||
|
|
||||||
## Windows
|
## Windows
|
||||||
|
|
||||||
- template: eng/build-pr.yml
|
- template: eng/build-pr.yml
|
||||||
parameters:
|
parameters:
|
||||||
agentOs: Windows_NT
|
agentOs: Windows_NT
|
||||||
|
@ -136,8 +134,8 @@ stages:
|
||||||
linuxPortable: true
|
linuxPortable: true
|
||||||
runTests: true
|
runTests: true
|
||||||
|
|
||||||
# MacOS
|
|
||||||
|
|
||||||
|
# MacOS
|
||||||
- template: eng/build-pr.yml
|
- template: eng/build-pr.yml
|
||||||
parameters:
|
parameters:
|
||||||
agentOs: Darwin
|
agentOs: Darwin
|
||||||
|
|
Loading…
Reference in a new issue