Merge remote-tracking branch 'origin/main' into net7.0

This commit is contained in:
Rolf Bjarne Kvinge 2022-07-07 17:03:58 +02:00
Родитель ea1419d6fc 3314ed823b
Коммит 2487c1845d
4 изменённых файлов: 11 добавлений и 6 удалений

Просмотреть файл

@ -188,7 +188,7 @@ schedules:
stages:
- template: templates/main-stage.yml
parameters:
xcodeChannel: Beta
xcodeChannel: Stable
isPR: false
provisionatorChannel: ${{ parameters.provisionatorChannel }}
pool: ${{ parameters.pool }}

Просмотреть файл

@ -198,7 +198,7 @@ trigger:
stages:
- template: templates/main-stage.yml
parameters:
xcodeChannel: Beta
xcodeChannel: Stable
isPR: false
provisionatorChannel: ${{ parameters.provisionatorChannel }}
pool: ${{ parameters.pool }}

Просмотреть файл

@ -181,7 +181,7 @@ pr:
stages:
- template: templates/main-stage.yml
parameters:
xcodeChannel: Beta
xcodeChannel: Stable
isPR: true
provisionatorChannel: ${{ parameters.provisionatorChannel }}
pool: ${{ parameters.pool }}

Просмотреть файл

@ -107,7 +107,7 @@ stages:
- ${{ each label in parameters.simTestsConfigurations }}:
- job: "tests_${{ replace(label, '-', '_') }}"
${{ if eq(parameters.parseLabels, true) }}:
condition: eq(dependencies.configure.outputs['labels.skip-all-tests'], '')
condition: eq(dependencies.configure.outputs['labels.skip-all-tests'], 'False')
dependsOn:
- ${{ if eq(parameters.parseLabels, true) }}:
- configure
@ -152,7 +152,7 @@ stages:
- job: publish_test_results
${{ if eq(parameters.parseLabels, true) }}:
condition: and(eq(dependencies.configure.outputs['labels.skip-all-tests'], ''), succeededOrFailed())
condition: and(eq(dependencies.configure.outputs['labels.skip-all-tests'], 'False'), succeededOrFailed())
${{ else }}:
condition: succeededOrFailed()
displayName: 'GitHub comment - Publish results'
@ -183,7 +183,7 @@ stages:
- job: publish_skipped_tests
${{ if eq(parameters.parseLabels, true) }}:
condition: ne(dependencies.configure.outputs['labels.skip-all-tests'], '')
condition: ne(dependencies.configure.outputs['labels.skip-all-tests'], 'False')
${{ else }}:
condition: false
displayName: 'GitHub comment - Skipped tests'
@ -197,6 +197,11 @@ stages:
clean: all
steps:
- template: ../common/checkout.yml
parameters:
isPR: ${{ parameters.isPR }}
- pwsh: |
Import-Module $Env:SYSTEM_DEFAULTWORKINGDIRECTORY\xamarin-macios\tools\devops\automation\scripts\MaciosCI.psd1