Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't suppress exit codes Appium driver install #27024

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+22 −7
Open

Don't suppress exit codes Appium driver install #27024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
afd70a4
Don't suppress exit codes Appium driver install
jfversluis Jan 9, 2025
78fe589
Fix setting of JAVA_HOME
jfversluis Jan 9, 2025
fbc2590
Update setup-jdk.yml
jfversluis Jan 9, 2025
4159d87
Update setup-jdk.yml
jfversluis Jan 9, 2025
74954d8
Update setup-jdk.yml
jfversluis Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions eng/pipelines/common/setup-jdk.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,25 @@
parameters:
jdkFolder: $(JAVA_HOME_17_X64)
jdkFolder: '$(JAVA_HOME_17_X64)'
jdkMajorVersion: 17

steps:
# Setup JDK Paths (gradle needs it)
- bash: |
echo "##vso[task.setvariable variable=JI_JAVA_HOME]${{ parameters.jdkFolder }}"
echo "##vso[task.setvariable variable=JAVA_HOME]${{ parameters.jdkFolder }}"
if [ -n "${{ parameters.jdkFolder }}" ]; then
jdkPath="${{ parameters.jdkFolder }}"
echo "Using provided JDK folder: $jdkPath"
else
jdkPath=$(/usr/libexec/java_home -V 2>&1 | grep -E "${{ parameters.jdkMajorVersion }}.jdk" | head -n 1 | awk '{print $NF}')
if [ -n "$jdkPath" ]; then
echo "Found JDK path: $jdkPath"
else
echo "Unable to find JDK ${{ parameters.jdkMajorVersion }}"
exit 1
fi
fi
echo "##vso[task.setvariable variable=JI_JAVA_HOME]$jdkPath"
echo "##vso[task.setvariable variable=JAVA_HOME]$jdkPath"
echo "JAVA_HOME set to '$jdkPath'"
displayName: Setup JDK ${{ parameters.jdkMajorVersion }} Paths
condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))

Expand All @@ -24,6 +37,7 @@ steps:
echo "JAVA_HOME set to '$env:JAVA_HOME'"
} else {
echo "Unable to set JAVA_HOME"
exit 1
}
displayName: Setup JDK ${{ parameters.jdkMajorVersion }} Paths
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
9 changes: 5 additions & 4 deletions eng/scripts/appium-install.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,13 @@ Write-Output "List of installed drivers after cleaup $drivers"
Write-Output "Check everything is installed correctly with appium doctor"

if ($IsWindows) {
appium driver doctor windows || & { "ignore failure"; $global:LASTEXITCODE = 0 }
appium driver doctor windows
}
if ($IsMacOS) {
# appium driver doctor xcuitest || & { "ignore failure"; $global:LASTEXITCODE = 0 }
# appium driver doctor mac2 || & { "ignore failure"; $global:LASTEXITCODE = 0 }
appium driver doctor xcuitest
appium driver doctor mac2
}
appium driver doctor uiautomator2 || & { "ignore failure"; $global:LASTEXITCODE = 0 }

appium driver doctor uiautomator2

Write-Output "Done, thanks!"
Loading