From a37055a9f2125f27aa9a463f2c30ed2568d55085 Mon Sep 17 00:00:00 2001 From: Jonathan Innis Date: Wed, 10 Mar 2021 15:20:10 -0800 Subject: [PATCH 1/3] Update pull.yml --- .github/pull.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/pull.yml b/.github/pull.yml index 71e1e286c72..5a78127e725 100644 --- a/.github/pull.yml +++ b/.github/pull.yml @@ -1,8 +1,8 @@ -version: 1 +version: "1" rules: - base: master - upstream: Azure:master + upstream: "Azure:master" mergeMethod: hardreset - base: release - upstream: Azure:master + upstream: "Azure:master" mergeMethod: hardreset From 352297909f0a44f862b3108c932c2dcf30e04cc9 Mon Sep 17 00:00:00 2001 From: Jonathan Innis Date: Thu, 11 Mar 2021 08:20:02 -0800 Subject: [PATCH 2/3] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3e1ef1ccca5..ef18dd0433f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -76,7 +76,7 @@ stages: - bash: | K8S_EXTENSION_VERSION=$(ls ${EXTENSION_FILE_NAME}* | cut -d "-" -f2) echo "##vso[task.setvariable variable=K8S_EXTENSION_VERSION]$K8S_EXTENSION_VERSION" - cp * $(K8S_EXTENSION_REPO_PATH)/extensions + cp * $(K8S_EXTENSION_REPO_PATH)/bin workingDirectory: $(CLI_REPO_PATH)/dist displayName: "Copy the Built .whl to Extension Test Path" From 11cd7f40c8e2fc86b18b36164dafa30e41f57984 Mon Sep 17 00:00:00 2001 From: Jonathan Innis Date: Thu, 11 Mar 2021 08:20:40 -0800 Subject: [PATCH 3/3] Update pull.yml --- .github/pull.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/pull.yml b/.github/pull.yml index 5a78127e725..f995650de92 100644 --- a/.github/pull.yml +++ b/.github/pull.yml @@ -1,8 +1,8 @@ version: "1" rules: - base: master - upstream: "Azure:master" + upstream: Azure:master mergeMethod: hardreset - base: release - upstream: "Azure:master" + upstream: Azure:master mergeMethod: hardreset