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 8 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
4 changes: 2 additions & 2 deletions ci/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,14 @@ jobs:
parameters:
job_name: macOS
name: macos
assignment: default
assignment: default
test_mode: ${{parameters.test_mode}}

- template: macOS.yml
parameters:
job_name: m1
name: m1
assignment: m1-builds
assignment: m1-builds-test
test_mode: ${{parameters.test_mode}}

- template: blackduck.yml
Expand Down
14 changes: 14 additions & 0 deletions ci/dev-env-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ for i in `seq 10`; do
nix-build --no-out-link nix -A tools -A ci-cached 2>&1 | tee nix_log || NIX_FAILED=1
# It should be in the last line but let’s use the last 3 and wildcards
# to be robust against slight changes.
tail -n 50 nix_log
step "$i"
if [[ $NIX_FAILED -ne 0 ]] &&
([[ $(tail -n 3 nix_log) == *"unexpected end-of-file"* ]] ||
[[ $(tail -n 3 nix_log) == *"decompressing xz file"* ]]); then
Expand All @@ -57,3 +59,15 @@ done
if [[ $NIX_FAILED -ne 0 ]]; then
exit 1
fi

step "Checking for existence of Bazel"

ls -l *

tail -n 500 nix_log

nix-build --no-out-link nix -A tools -A ci-cached 2>&1

ls -lrt /nix/store/* || true


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