Merge branch 'release/8.0.1xx' into release/8.0.2xx
This commit is contained in:
commit
e552fd48f3
13 changed files with 36 additions and 75 deletions
|
@ -1,12 +1,13 @@
|
|||
# Pipeline documentation at https://github.com/dotnet/dotnet/blob/main/docs/license-scanning.md
|
||||
|
||||
schedules:
|
||||
- cron: "0 7 * * 1-5"
|
||||
displayName: Run on weekdays at 7am UTC
|
||||
- cron: "0 7 * * 1"
|
||||
displayName: Run on Mondays at 7am UTC
|
||||
branches:
|
||||
include:
|
||||
- main
|
||||
- release/*
|
||||
- release/*.0.1xx*
|
||||
- internal/release/*.0.1xx*
|
||||
|
||||
pr: none
|
||||
trigger: none
|
||||
|
|
|
@ -4,7 +4,8 @@ schedules:
|
|||
branches:
|
||||
include:
|
||||
- main
|
||||
- release/*
|
||||
- release/*.0.1xx*
|
||||
- internal/release/*.0.1xx*
|
||||
|
||||
pr: none
|
||||
trigger: none
|
||||
|
|
|
@ -90,7 +90,10 @@ jobs:
|
|||
steps:
|
||||
- template: ../steps/vmr-prepare.yml
|
||||
parameters:
|
||||
vmrBranch: ${{ parameters.vmrBranch }}
|
||||
${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
|
||||
vmrBranch: $(System.PullRequest.TargetBranch)
|
||||
${{ else }}:
|
||||
vmrBranch: ${{ parameters.vmrBranch }}
|
||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
skipComponentGovernanceDetection: true
|
||||
|
||||
|
|
|
@ -28,11 +28,11 @@ steps:
|
|||
path: vmr
|
||||
clean: true
|
||||
|
||||
- ${{ if or(not(parameters.isBuiltFromVmr), eq(variables['System.TeamProject'], 'internal')) }}:
|
||||
- script: |
|
||||
git switch -c ${{ parameters.vmrBranch }}
|
||||
displayName: Checkout ${{ parameters.vmrBranch }}
|
||||
workingDirectory: $(Agent.BuildDirectory)/vmr
|
||||
- script: |
|
||||
git checkout --track origin/${{ parameters.vmrBranch }}
|
||||
echo "##vso[task.setvariable variable=vmrBranch]${{ parameters.vmrBranch }}"
|
||||
displayName: Check out ${{ parameters.vmrBranch }}
|
||||
workingDirectory: $(Agent.BuildDirectory)/vmr
|
||||
|
||||
# TODO (https://github.com/dotnet/arcade/issues/11332): Allow full CG?
|
||||
# Currently, we ignore dirs of individual repos - they have been scanned before
|
||||
|
|
|
@ -22,6 +22,13 @@ steps:
|
|||
displayName: Clone dotnet/installer
|
||||
path: installer
|
||||
|
||||
# This step is needed so that when we get a detached HEAD / shallow clone,
|
||||
# we still pull the commit into the temporary installer clone to use it during the sync.
|
||||
- script: |
|
||||
git branch installer-head
|
||||
displayName: Label PR commit
|
||||
workingDirectory: $(Agent.BuildDirectory)/installer
|
||||
|
||||
- script: |
|
||||
git checkout -B ${{ parameters.vmrBranch }}
|
||||
echo "##vso[task.setvariable variable=vmrBranch]${{ parameters.vmrBranch }}"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue