chore: Adjust iOS logging, install linux partial

unoplatform · Nov 6, 2024 · 862de4a · 862de4a
1 parent d9a9b11
commit 862de4a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/build/scripts/ios-uitest-run.sh b/build/scripts/ios-uitest-run.sh
@@ -15,6 +15,7 @@ export UNO_UITEST_SIMULATOR_NAME="iPad Pro (12.9-inch) (6th generation)"
 echo "Lising iOS simulators"
 xcrun simctl list devices --json
 
+echo "Starting simulator"
 /Applications/Xcode.app/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator &
 
 # Prime the output directory
@@ -25,6 +26,7 @@ mkdir -p $UNO_UITEST_SCREENSHOT_PATH/_logs
 ##
 
 ## Install iOS 16.1 simulators
+echo "Installing emulators"
 xcodes runtimes install --keep-archive 'iOS 16.1' || true
 
 # Wait while ios runtime 16.1 is not having simulators. The install process may

diff --git a/build/stage-uitests-wasm.yml b/build/stage-uitests-wasm.yml
@@ -47,6 +47,11 @@
   - download: current
     artifact: Wasm_UITest
 
+  - template: templates/dotnet-install-linux.yml
+    parameters:
+      installJava: false
+      installWorkloads: false
+
   - bash: |
       export UNO_UITEST_WASM_OUTPUT_PATH=$(Pipeline.Workspace)/Wasm_UITest
       chmod +x build/scripts/wasm-uitest-run.sh

diff --git a/build/templates/dotnet-install-linux.yml b/build/templates/dotnet-install-linux.yml
@@ -1,6 +1,8 @@
 parameters:
   DotNetVersion: '9.0.100-rc.2.24474.11'
   UnoCheck_Version: '1.26.1'
+  installJava: true
+  installWorkloads: true
 steps:
 
   - task: UseDotNet@2
@@ -21,9 +23,10 @@ steps:
       sudo update-java-alternatives --set msopenjdk-11-amd64
     displayName: Install OpenJDK 11
     retryCountOnTaskFailure: 3
+    condition: eq('${{ parameters.installJava }}', 'true')
 
   - bash: |
       dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
       uno-check --verbose --ci --non-interactive --fix --skip gtk3 --skip androidsdk --pre-major
     displayName: Install .NET Workloads
-    condition: eq(variables['Agent.OS'], 'Linux')
+    condition: and( eq(variables['Agent.OS'], 'Linux'), eq('${{ parameters.installWorkloads }}', 'true') )