Skip to content

Commit

Permalink
Don't fail Mac Catalyst just so we can go green (#2975)
Browse files Browse the repository at this point in the history
  • Loading branch information
mattleibow authored Aug 19, 2024
1 parent 40b0f57 commit 6058ab0
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 0 deletions.
2 changes: 2 additions & 0 deletions scripts/azure-templates-bootstrapper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ parameters:
skipSteps: false # whether or not to run any steps
use1ESPipelineTemplates: false # whether or not we are building using the internal 1ES Pipeline Templates
sdl: [] # the SDL properties to use for this job
continueOnError: false # whether or not to continue on error

jobs:
- job: ${{ parameters.name }}
Expand All @@ -45,6 +46,7 @@ jobs:
pool: ${{ parameters.buildAgent.pool }}
dependsOn: ${{ parameters.dependsOn }}
condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}
variables:
${{ if ne(parameters.buildAgent.variables, '') }}:
${{ parameters.buildAgent.variables }}
Expand Down
1 change: 1 addition & 0 deletions scripts/azure-templates-stages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -885,6 +885,7 @@ stages:
parameters:
name: tests_maccatalyst_macos
displayName: Mac Catalyst (macOS)
continueOnError: true
buildPipelineType: ${{ parameters.buildPipelineType }}
buildAgent: ${{ parameters.buildAgentMac }}
target: tests-maccatalyst
Expand Down
6 changes: 6 additions & 0 deletions scripts/install-android-sdk.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ function Get-SdkManager {
$cmdline | Get-ChildItem | ForEach-Object {
Write-Host "${Indent} $_"
}
} else {
Write-Host "${Indent} No command line tools found."
return ""
}

Write-Host "${Indent} Selecting the latest command line tools..."
Expand Down Expand Up @@ -63,6 +66,9 @@ function Get-Adb {
$platformtools = Join-Path "$SdkPath" "platform-tools"
if (Test-Path $platformtools) {
Write-Host "${Indent} Found platform tools: $platformtools"
} else {
Write-Host "${Indent} No platform tools found."
return ""
}

$adbExt = if (-not $IsMacOS -and -not $IsLinux) { ".exe" } else { "" }
Expand Down

0 comments on commit 6058ab0

Please sign in to comment.