Skip to content

Commit fe8f026

Browse files
committedNov 9, 2020
Auto merge of #78889 - Dylan-DPC:rollup-6zjhahf, r=Dylan-DPC
Rollup of 12 pull requests Successful merges: - #77640 (Refactor IntErrorKind to avoid "underflow" terminology) - #78026 (Define `fs::hard_link` to not follow symlinks.) - #78114 (Recognize `private_intra_doc_links` as a lint) - #78228 (Promote aarch64-unknown-linux-gnu to Tier 1) - #78345 (Fix handling of item names for HIR) - #78437 (BTreeMap: stop mistaking node for an orderly place) - #78476 (fix some incorrect aliasing in the BTree) - #78674 (inliner: Use substs_for_mir_body) - #78748 (Implement destructuring assignment for tuples) - #78868 (Fix tab focus on restyled switches) - #78878 (Avoid overlapping cfg attributes when both macOS and aarch64) - #78882 (Nicer hunk headers for rust files) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 1773f60 + 92adac9 commit fe8f026

File tree

56 files changed

+797
-391
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+797
-391
lines changed
 

‎.gitattributes

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* text=auto eol=lf
44
*.cpp rust
55
*.h rust
6-
*.rs rust
6+
*.rs rust diff=rust
77
*.fixed linguist-language=Rust
88
src/etc/installer/gfx/* binary
99
*.woff binary

‎.github/workflows/ci.yml

+5-110
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,11 @@ jobs:
154154
strategy:
155155
matrix:
156156
include:
157+
- name: aarch64-gnu
158+
os:
159+
- self-hosted
160+
- ARM64
161+
- linux
157162
- name: arm-android
158163
os: ubuntu-latest-xl
159164
env: {}
@@ -497,116 +502,6 @@ jobs:
497502
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
498503
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
499504
if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')"
500-
auto-fallible:
501-
name: auto-fallible
502-
env:
503-
CI_JOB_NAME: "${{ matrix.name }}"
504-
SCCACHE_BUCKET: rust-lang-gha-caches
505-
DEPLOY_BUCKET: rust-lang-gha
506-
TOOLSTATE_REPO: "https://github.com/pietroalbini/rust-toolstate"
507-
TOOLSTATE_ISSUES_API_URL: "https://api.github.com/repos/pietroalbini/rust-toolstate/issues"
508-
TOOLSTATE_PUBLISH: 1
509-
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZOMUQATD5
510-
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZH5AYXDVF
511-
CACHE_DOMAIN: ci-caches-gha.rust-lang.org
512-
if: "github.event_name == 'push' && github.ref == 'refs/heads/auto' && github.repository == 'rust-lang-ci/rust'"
513-
strategy:
514-
fail-fast: false
515-
matrix:
516-
include:
517-
- name: aarch64-gnu
518-
os:
519-
- self-hosted
520-
- ARM64
521-
- linux
522-
timeout-minutes: 600
523-
runs-on: "${{ matrix.os }}"
524-
steps:
525-
- name: disable git crlf conversion
526-
run: git config --global core.autocrlf false
527-
- name: checkout the source code
528-
uses: actions/checkout@v2
529-
with:
530-
fetch-depth: 2
531-
- name: configure the PR in which the error message will be posted
532-
run: "echo \"[CI_PR_NUMBER=$num]\""
533-
env:
534-
num: "${{ github.event.number }}"
535-
if: "success() && !env.SKIP_JOBS && github.event_name == 'pull_request'"
536-
- name: add extra environment variables
537-
run: src/ci/scripts/setup-environment.sh
538-
env:
539-
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
540-
if: success() && !env.SKIP_JOB
541-
- name: decide whether to skip this job
542-
run: src/ci/scripts/should-skip-this.sh
543-
if: success() && !env.SKIP_JOB
544-
- name: configure GitHub Actions to kill the build when outdated
545-
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
546-
with:
547-
github_token: "${{ secrets.github_token }}"
548-
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
549-
- name: collect CPU statistics
550-
run: src/ci/scripts/collect-cpu-stats.sh
551-
if: success() && !env.SKIP_JOB
552-
- name: show the current environment
553-
run: src/ci/scripts/dump-environment.sh
554-
if: success() && !env.SKIP_JOB
555-
- name: install awscli
556-
run: src/ci/scripts/install-awscli.sh
557-
if: success() && !env.SKIP_JOB
558-
- name: install sccache
559-
run: src/ci/scripts/install-sccache.sh
560-
if: success() && !env.SKIP_JOB
561-
- name: select Xcode
562-
run: src/ci/scripts/select-xcode.sh
563-
if: success() && !env.SKIP_JOB
564-
- name: install clang
565-
run: src/ci/scripts/install-clang.sh
566-
if: success() && !env.SKIP_JOB
567-
- name: install WIX
568-
run: src/ci/scripts/install-wix.sh
569-
if: success() && !env.SKIP_JOB
570-
- name: ensure the build happens on a partition with enough space
571-
run: src/ci/scripts/symlink-build-dir.sh
572-
if: success() && !env.SKIP_JOB
573-
- name: disable git crlf conversion
574-
run: src/ci/scripts/disable-git-crlf-conversion.sh
575-
if: success() && !env.SKIP_JOB
576-
- name: install MSYS2
577-
run: src/ci/scripts/install-msys2.sh
578-
if: success() && !env.SKIP_JOB
579-
- name: install MinGW
580-
run: src/ci/scripts/install-mingw.sh
581-
if: success() && !env.SKIP_JOB
582-
- name: install ninja
583-
run: src/ci/scripts/install-ninja.sh
584-
if: success() && !env.SKIP_JOB
585-
- name: enable ipv6 on Docker
586-
run: src/ci/scripts/enable-docker-ipv6.sh
587-
if: success() && !env.SKIP_JOB
588-
- name: disable git crlf conversion
589-
run: src/ci/scripts/disable-git-crlf-conversion.sh
590-
if: success() && !env.SKIP_JOB
591-
- name: checkout submodules
592-
run: src/ci/scripts/checkout-submodules.sh
593-
if: success() && !env.SKIP_JOB
594-
- name: ensure line endings are correct
595-
run: src/ci/scripts/verify-line-endings.sh
596-
if: success() && !env.SKIP_JOB
597-
- name: run the build
598-
run: src/ci/scripts/run-build-from-ci.sh
599-
env:
600-
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
601-
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
602-
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
603-
if: success() && !env.SKIP_JOB
604-
- name: upload artifacts to S3
605-
run: src/ci/scripts/upload-artifacts.sh
606-
env:
607-
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
608-
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
609-
if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')"
610505
try:
611506
name: try
612507
env:

0 commit comments

Comments
 (0)