Small fixes to provisioning (#1169)

* Fix wrong script * Essentials build requires xcode even for Android tests * Update android.cake * Update android.cake * Revert "Update android.cake" This reverts commit eaf72bb. * Revert "Update android.cake" This reverts commit de8f42a.
dotnet · Jun 3, 2021 · 7cb1f3d · 7cb1f3d
1 parent d576446
commit 7cb1f3d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/eng/pipelines/common/device-tests-steps.yml b/eng/pipelines/common/device-tests-steps.yml
@@ -6,20 +6,20 @@ parameters:
 steps:
   - checkout: self
     clean: true
+
+  - task: xamops.azdevex.provisionator-task.provisionator@1
+    displayName: 'Provision Xcode'
+    condition: ne(variables['REQUIRED_XCODE'], '')
+    inputs:
+      provisioning_script: $(provisionator.xcode)
 
+  - script: |
+      echo "##vso[task.prependpath]/Library/Frameworks/Mono.framework/Versions/Current/Commands/"
+      echo "##vso[task.prependpath]~/Library/Developer/Xamarin/android-sdk-macosx"
+    displayName: 'Setup SDK Paths'
+    condition: ne(variables['osx2019VmPool'], 'Azure Pipelines')
+  
   - ${{ if eq(parameters['platform'], 'ios') }}:
-    - task: xamops.azdevex.provisionator-task.provisionator@1
-      displayName: 'Provision Xcode'
-      condition: ne(variables['REQUIRED_XCODE'], '')
-      inputs:
-        provisioning_script: $(provisionator.xcode)
-
-    - script: |
-        echo "##vso[task.prependpath]/Library/Frameworks/Mono.framework/Versions/Current/Commands/"
-        echo "##vso[task.prependpath]~/Library/Developer/Xamarin/android-sdk-macosx"
-      displayName: 'Setup SDK Paths'
-      condition: ne(variables['osx2019VmPool'], 'Azure Pipelines')
-
     - task: InstallAppleCertificate@2
       displayName: 'Install an Apple certificate'
       inputs:

diff --git a/eng/pipelines/handlers.yml b/eng/pipelines/handlers.yml
@@ -225,7 +225,7 @@ stages:
                 displayName: 'Provisionator'
                 condition: eq(variables['provisioning'], 'true')
                 inputs:
-                  provisioning_script: $(provisionator.xcode)
+                  provisioning_script: $(provisionator.path)
                   provisioning_extra_args: $(provisionator.extraArguments)
 
               - script: |
@@ -310,7 +310,7 @@ stages:
                   displayName: 'Provisionator'
                   condition: eq(variables['provisioning'], 'true')
                   inputs:
-                    provisioning_script: $(provisionator.xcode)
+                    provisioning_script: $(provisionator.path)
                     provisioning_extra_args: $(provisionator.extraArguments)
 
                 - script: |