From 195977b515708b18da8cad4da3d14ead72201f39 Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Wed, 8 Feb 2023 13:44:25 +0100 Subject: [PATCH] add args to vmr sync --- eng/pipelines/templates/steps/vmr-pull-updates.yml | 2 ++ eng/vmr-sync.sh | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/steps/vmr-pull-updates.yml b/eng/pipelines/templates/steps/vmr-pull-updates.yml index a63605b16..7756080bc 100644 --- a/eng/pipelines/templates/steps/vmr-pull-updates.yml +++ b/eng/pipelines/templates/steps/vmr-pull-updates.yml @@ -34,5 +34,7 @@ steps: --tmp $(Agent.TempDirectory) --branch ${{ parameters.vmrBranch }} --target-ref ${{ parameters.targetRef }} + --readme-template $(Agent.BuildDirectory)/installer/src/VirtualMonoRepo/README.template.md + --tpn-template $(Agent.BuildDirectory)/installer/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt displayName: Synchronize dotnet/dotnet workingDirectory: $(Agent.BuildDirectory)/installer diff --git a/eng/vmr-sync.sh b/eng/vmr-sync.sh index 5251d4faf..d313de8d2 100755 --- a/eng/vmr-sync.sh +++ b/eng/vmr-sync.sh @@ -89,6 +89,8 @@ vmr_dir='' vmr_branch='main' target_ref='' verbosity=verbose +tpn_template='' +readme_template='' while [[ $# -gt 0 ]]; do opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" @@ -112,6 +114,14 @@ while [[ $# -gt 0 ]]; do target_ref=$2 shift ;; + --readme-template) + readme_template=$2 + shift + ;; + --tpn-template) + tpn_template=$2 + shift + ;; -h|--help) print_help exit 0 @@ -180,7 +190,7 @@ fi highlight "Starting the synchronization to '$target_ref'.." set +e -if "$dotnet" darc vmr update --vmr "$vmr_dir" --tmp "$tmp_dir" --$verbosity --recursive --additional-remotes "installer:$installer_dir" "installer:$target_ref"; then +if "$dotnet" darc vmr update --vmr "$vmr_dir" --tmp "$tmp_dir" --$verbosity --recursive --readme-template $readme_template --tpn-template $tpn_template --additional-remotes "installer:$installer_dir" "installer:$target_ref"; then highlight "Synchronization succeeded" else fail "Synchronization of dotnet/dotnet to '$target_ref' failed!"