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.

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

testing m1 builders #19991

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ci/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
parameters:
job_name: m1
name: m1
assignment: m1-builds
assignment: m1-builds-test
test_mode: ${{parameters.test_mode}}

- template: blackduck.yml
Expand Down
17 changes: 4 additions & 13 deletions ci/macOS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@ jobs:
pool:
name: macOS-pool
demands: assignment -equals ${{parameters.assignment}}
condition: and(succeeded(),
or(eq('${{parameters.name}}', 'macos'),
and(or(eq(variables['Build.SourceBranchName'], 'main'),
eq(variables['Build.SourceBranchName'], 'main-2.x')),
eq(dependencies.check_for_release.outputs['out.is_release'], 'false'))))
variables:
- name: release_sha
value: $[ dependencies.check_for_release.outputs['out.release_sha'] ]
Expand All @@ -32,8 +27,7 @@ jobs:
- template: job-variables.yml
steps:
# Do not record start/end times for m1
- ${{ if eq(parameters.name, 'macos') }}:
- template: report-start.yml
- template: report-start.yml
- template: clear-shared-segments-macos.yml
- checkout: self
- bash: |
Expand All @@ -51,11 +45,8 @@ jobs:
is_release: variables.is_release
test_mode: ${{parameters.test_mode}}
# Do not upload metrics for m1
- ${{ if eq(parameters.name, 'macos') }}:
- template: upload-bazel-metrics.yml
- template: upload-bazel-metrics.yml
- template: tell-slack-failed.yml
parameters:
trigger_sha: '$(trigger_sha)'
# Do not record start/end times for m1
- ${{ if eq(parameters.name, 'macos') }}:
- template: report-end.yml
trigger_sha: '$(trigger_sha)'
- template: report-end.yml
Loading