Skip to content

Commit 0b6ec48

Browse files
authored
[ci] Fix path to designer checkout (#4371)
Context: https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=3531536&view=logs&jobId=bfe1c8f0-0562-5169-4501-8cf84831035d&j=bfe1c8f0-0562-5169-4501-8cf84831035d&t=8d0f59aa-88c2-53a6-661f-85ce58936952 Context: ed29bf1 Designer test jobs have been failing when attempting to checkout a different source branch after cloning the repo. It seems that the value of `$(System.DefaultWorkingDirectory)` has changed recently. The value of this this variable will apparently change depending on the number of checkout steps in a given job, and whether or not those checkout steps use a custom path.
1 parent 2fd7385 commit 0b6ec48

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

build-tools/automation/azure-pipelines.yaml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -884,7 +884,7 @@ stages:
884884
if (("$branchName" -ne "master") -and ("$branchName" -notlike "d16*")) {
885885
$branchName = "master"
886886
}
887-
Set-Location -Path $(System.DefaultWorkingDirectory)/designer
887+
Set-Location -Path $(System.DefaultWorkingDirectory)
888888
git checkout $branchName
889889
git submodule update -q --init --recursive
890890
displayName: Clone and update designer
@@ -893,18 +893,14 @@ stages:
893893
displayName: provision designer dependencies
894894
inputs:
895895
github_token: $(GitHub.Token)
896-
provisioning_script: $(System.DefaultWorkingDirectory)/designer/bot-provisioning/dependencies.csx
896+
provisioning_script: $(System.DefaultWorkingDirectory)/bot-provisioning/dependencies.csx
897897
provisioning_extra_args: -remove Xamarin.Android -vv DEVDIV_PKGS_NUGET_TOKEN=$(DevDiv.NuGet.Token) SECTOOLS_PKGS_NUGET_TOKEN=$(SecTools.NuGet.Token)
898898

899899
- template: yaml-templates/run-installer.yaml
900900

901901
- template: designer/android-designer-build-mac.yaml@yaml
902-
parameters:
903-
designerSourcePath: $(System.DefaultWorkingDirectory)/designer
904902

905903
- template: designer/android-designer-tests.yaml@yaml
906-
parameters:
907-
designerSourcePath: $(System.DefaultWorkingDirectory)/designer
908904

909905
# Check - "Xamarin.Android (Test Designer Windows)"
910906
- job: designer_integration_win
@@ -935,7 +931,7 @@ stages:
935931
if (("$branchName" -ne "master") -and ("$branchName" -notlike "d16*")) {
936932
$branchName = "master"
937933
}
938-
Set-Location -Path $(System.DefaultWorkingDirectory)\designer
934+
Set-Location -Path $(System.DefaultWorkingDirectory)
939935
git checkout $branchName
940936
git submodule update -q --init --recursive
941937
displayName: Clone and update designer
@@ -944,18 +940,14 @@ stages:
944940
displayName: provision designer dependencies
945941
inputs:
946942
github_token: $(GitHub.Token)
947-
provisioning_script: $(System.DefaultWorkingDirectory)\designer\bot-provisioning\dependencies.csx
943+
provisioning_script: $(System.DefaultWorkingDirectory)\bot-provisioning\dependencies.csx
948944
provisioning_extra_args: -vv DEVDIV_PKGS_NUGET_TOKEN=$(DevDiv.NuGet.Token) SECTOOLS_PKGS_NUGET_TOKEN=$(SecTools.NuGet.Token)
949945

950946
- template: yaml-templates\run-installer.yaml
951947

952948
- template: designer\android-designer-build-win.yaml@yaml
953-
parameters:
954-
designerSourcePath: $(System.DefaultWorkingDirectory)\designer
955949

956950
- template: designer\android-designer-tests.yaml@yaml
957-
parameters:
958-
designerSourcePath: $(System.DefaultWorkingDirectory)\designer
959951

960952
- stage: integrated_regression_test
961953
displayName: Regression Tests

0 commit comments

Comments
 (0)