Skip to content

Commit 50a6d07

Browse files
richkadelrichkadel
authored
Merge pull request #6 from rust-lang/master
update from origin 2020-06-23
2 parents 791cccc + 3c90ae8 commit 50a6d07

File tree

919 files changed

+15379
-6816
lines changed

Some content is hidden

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

919 files changed

+15379
-6816
lines changed

‎.github/workflows/ci.yml

Lines changed: 129 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,6 @@ jobs:
152152
- name: dist-x86_64-linux
153153
os: ubuntu-latest-xl
154154
env: {}
155-
- name: dist-x86_64-linux-alt
156-
env:
157-
IMAGE: dist-x86_64-linux
158-
os: ubuntu-latest-xl
159155
timeout-minutes: 600
160156
runs-on: "${{ matrix.os }}"
161157
steps:
@@ -373,35 +369,6 @@ jobs:
373369
env:
374370
DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
375371
os: ubuntu-latest-xl
376-
- name: dist-x86_64-apple
377-
env:
378-
SCRIPT: "./x.py dist"
379-
RUST_CONFIGURE_ARGS: "--target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc"
380-
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
381-
MACOSX_DEPLOYMENT_TARGET: 10.7
382-
NO_LLVM_ASSERTIONS: 1
383-
NO_DEBUG_ASSERTIONS: 1
384-
DIST_REQUIRE_ALL_TOOLS: 1
385-
os: macos-latest
386-
- name: dist-x86_64-apple-alt
387-
env:
388-
SCRIPT: "./x.py dist"
389-
RUST_CONFIGURE_ARGS: "--enable-extended --enable-profiler --set rust.jemalloc"
390-
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
391-
MACOSX_DEPLOYMENT_TARGET: 10.7
392-
NO_LLVM_ASSERTIONS: 1
393-
NO_DEBUG_ASSERTIONS: 1
394-
os: macos-latest
395-
- name: x86_64-apple
396-
env:
397-
SCRIPT: "./x.py test"
398-
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc"
399-
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
400-
MACOSX_DEPLOYMENT_TARGET: 10.8
401-
MACOSX_STD_DEPLOYMENT_TARGET: 10.7
402-
NO_LLVM_ASSERTIONS: 1
403-
NO_DEBUG_ASSERTIONS: 1
404-
os: macos-latest
405372
- name: x86_64-msvc-1
406373
env:
407374
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
@@ -584,6 +551,135 @@ jobs:
584551
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
585552
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
586553
if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')"
554+
auto-fallible:
555+
name: auto-fallible
556+
env:
557+
CI_JOB_NAME: "${{ matrix.name }}"
558+
SCCACHE_BUCKET: rust-lang-gha-caches
559+
DEPLOY_BUCKET: rust-lang-gha
560+
TOOLSTATE_REPO: "https://github.com/pietroalbini/rust-toolstate"
561+
TOOLSTATE_ISSUES_API_URL: "https://api.github.com/repos/pietroalbini/rust-toolstate/issues"
562+
TOOLSTATE_PUBLISH: 1
563+
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZOMUQATD5
564+
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZH5AYXDVF
565+
CACHE_DOMAIN: ci-caches-gha.rust-lang.org
566+
if: "github.event_name == 'push' && github.ref == 'refs/heads/auto' && github.repository == 'rust-lang-ci/rust'"
567+
strategy:
568+
matrix:
569+
include:
570+
- name: dist-x86_64-apple
571+
env:
572+
SCRIPT: "./x.py dist"
573+
RUST_CONFIGURE_ARGS: "--target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc"
574+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
575+
MACOSX_DEPLOYMENT_TARGET: 10.7
576+
NO_LLVM_ASSERTIONS: 1
577+
NO_DEBUG_ASSERTIONS: 1
578+
DIST_REQUIRE_ALL_TOOLS: 1
579+
os: macos-latest
580+
- name: dist-x86_64-apple-alt
581+
env:
582+
SCRIPT: "./x.py dist"
583+
RUST_CONFIGURE_ARGS: "--enable-extended --enable-profiler --set rust.jemalloc"
584+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
585+
MACOSX_DEPLOYMENT_TARGET: 10.7
586+
NO_LLVM_ASSERTIONS: 1
587+
NO_DEBUG_ASSERTIONS: 1
588+
os: macos-latest
589+
- name: x86_64-apple
590+
env:
591+
SCRIPT: "./x.py test"
592+
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc"
593+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
594+
MACOSX_DEPLOYMENT_TARGET: 10.8
595+
MACOSX_STD_DEPLOYMENT_TARGET: 10.7
596+
NO_LLVM_ASSERTIONS: 1
597+
NO_DEBUG_ASSERTIONS: 1
598+
os: macos-latest
599+
timeout-minutes: 600
600+
runs-on: "${{ matrix.os }}"
601+
steps:
602+
- name: disable git crlf conversion
603+
run: git config --global core.autocrlf false
604+
shell: bash
605+
- name: checkout the source code
606+
uses: actions/checkout@v1
607+
with:
608+
fetch-depth: 2
609+
- name: configure GitHub Actions to kill the build when outdated
610+
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
611+
with:
612+
github_token: "${{ secrets.github_token }}"
613+
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
614+
- name: add extra environment variables
615+
run: src/ci/scripts/setup-environment.sh
616+
env:
617+
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
618+
if: success() && !env.SKIP_JOB
619+
- name: decide whether to skip this job
620+
run: src/ci/scripts/should-skip-this.sh
621+
if: success() && !env.SKIP_JOB
622+
- name: collect CPU statistics
623+
run: src/ci/scripts/collect-cpu-stats.sh
624+
if: success() && !env.SKIP_JOB
625+
- name: show the current environment
626+
run: src/ci/scripts/dump-environment.sh
627+
if: success() && !env.SKIP_JOB
628+
- name: install awscli
629+
run: src/ci/scripts/install-awscli.sh
630+
if: success() && !env.SKIP_JOB
631+
- name: install sccache
632+
run: src/ci/scripts/install-sccache.sh
633+
if: success() && !env.SKIP_JOB
634+
- name: install clang
635+
run: src/ci/scripts/install-clang.sh
636+
if: success() && !env.SKIP_JOB
637+
- name: install WIX
638+
run: src/ci/scripts/install-wix.sh
639+
if: success() && !env.SKIP_JOB
640+
- name: install InnoSetup
641+
run: src/ci/scripts/install-innosetup.sh
642+
if: success() && !env.SKIP_JOB
643+
- name: ensure the build happens on a partition with enough space
644+
run: src/ci/scripts/symlink-build-dir.sh
645+
if: success() && !env.SKIP_JOB
646+
- name: disable git crlf conversion
647+
run: src/ci/scripts/disable-git-crlf-conversion.sh
648+
if: success() && !env.SKIP_JOB
649+
- name: install MSYS2
650+
run: src/ci/scripts/install-msys2.sh
651+
if: success() && !env.SKIP_JOB
652+
- name: install MinGW
653+
run: src/ci/scripts/install-mingw.sh
654+
if: success() && !env.SKIP_JOB
655+
- name: install ninja
656+
run: src/ci/scripts/install-ninja.sh
657+
if: success() && !env.SKIP_JOB
658+
- name: enable ipv6 on Docker
659+
run: src/ci/scripts/enable-docker-ipv6.sh
660+
if: success() && !env.SKIP_JOB
661+
- name: disable git crlf conversion
662+
run: src/ci/scripts/disable-git-crlf-conversion.sh
663+
if: success() && !env.SKIP_JOB
664+
- name: checkout submodules
665+
run: src/ci/scripts/checkout-submodules.sh
666+
if: success() && !env.SKIP_JOB
667+
- name: ensure line endings are correct
668+
run: src/ci/scripts/verify-line-endings.sh
669+
if: success() && !env.SKIP_JOB
670+
- name: run the build
671+
run: src/ci/scripts/run-build-from-ci.sh
672+
env:
673+
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
674+
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
675+
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
676+
if: success() && !env.SKIP_JOB
677+
- name: upload artifacts to S3
678+
run: src/ci/scripts/upload-artifacts.sh
679+
env:
680+
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
681+
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
682+
if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')"
587683
master:
588684
name: master
589685
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)