From db82c339daa71c14e553893adb5f262cb98122b9 Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Wed, 6 Oct 2021 14:02:29 -0500 Subject: [PATCH] Revert "[build] delete platform-31 folder on test jobs (#6103)" This reverts commit 21751b5bc4292be4b23dd58577cb6cf9f01d82bb. --- build-tools/automation/azure-pipelines.yaml | 4 ---- .../automation/yaml-templates/delete-platform-31.yaml | 10 ---------- .../yaml-templates/setup-test-environment.yaml | 2 -- 3 files changed, 16 deletions(-) delete mode 100644 build-tools/automation/yaml-templates/delete-platform-31.yaml diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 3e1449fe63a..8e04fa166fd 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -173,8 +173,6 @@ stages: - template: yaml-templates\clean.yaml - - template: yaml-templates\delete-platform-31.yaml - - script: | echo ##vso[task.setvariable variable=JI_JAVA_HOME]%USERPROFILE%\android-toolchain\$(XA.Jdk11.Folder) displayName: set JI_JAVA_HOME @@ -295,8 +293,6 @@ stages: - template: yaml-templates\clean.yaml - - template: yaml-templates\delete-platform-31.yaml - - script: | echo ##vso[task.setvariable variable=JI_JAVA_HOME]%USERPROFILE%\android-toolchain\$(XA.Jdk11.Folder) displayName: set JI_JAVA_HOME diff --git a/build-tools/automation/yaml-templates/delete-platform-31.yaml b/build-tools/automation/yaml-templates/delete-platform-31.yaml deleted file mode 100644 index f38011393eb..00000000000 --- a/build-tools/automation/yaml-templates/delete-platform-31.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# NOTE: temporary workaround to delete platform-31 -steps: - -- script: rm -rfv "$HOME/Library/Android/sdk/platforms/android-31" - displayName: delete API 31 - condition: and(succeeded(), eq(variables['agent.os'], 'Darwin')) - -- script: if exist "%USERPROFILE%\android-toolchain\sdk\platforms\android-31" rmdir /s /q "%USERPROFILE%\android-toolchain\sdk\platforms\android-31" - displayName: delete API 31 - condition: and(succeeded(), eq(variables['agent.os'], 'Windows_NT')) diff --git a/build-tools/automation/yaml-templates/setup-test-environment.yaml b/build-tools/automation/yaml-templates/setup-test-environment.yaml index 1c2b31fa81e..c8978481cd3 100644 --- a/build-tools/automation/yaml-templates/setup-test-environment.yaml +++ b/build-tools/automation/yaml-templates/setup-test-environment.yaml @@ -19,8 +19,6 @@ steps: parameters: provisionExtraArgs: ${{ parameters.provisionExtraArgs }} -- template: delete-platform-31.yaml - - script: | echo "##vso[task.setvariable variable=JI_JAVA_HOME]$HOME/Library/Android/${{ parameters.jdkTestFolder }}" echo "##vso[task.setvariable variable=DOTNET_TOOL_PATH]$HOME/Library/Android/dotnet/dotnet"