nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-23 15:23:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #71434 - pietroalbini:shrink-gha-config, r=Mark-Simulacrum

Browse Source 
Shrink GHA configuration

This shrinks our GHA configuration by [taking advantage of two new features GitHub just announced](https://github.blog/2020-04-22-github-actions-community-momentum-enterprise-capabilities-and-developer-improvements/):

* [Default values for `steps[].shell`](https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#defaultsrun)
* [Being able to include values in a matrix without having to duplicate the job names.](https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#example-including-new-combinations)

The configuration should be functionally equivalent to the previous one.

r? @Mark-Simulacrum
This commit is contained in:
bors 2020-04-26 04:30:24 +00:00
commit 019ab732ce
2 changed files with 40 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
.github/workflows/ci.yml vendored
View File

@ -24,6 +24,9 @@ name: CI
pull_request: pull_request:
branches: branches:
- "**" - "**"
defaults:
run:
shell: "python src/ci/exec-with-shell.py {0}"
jobs: jobs:
pr: pr:
name: PR name: PR
@ -34,10 +37,6 @@ jobs:
if: "github.event_name == 'pull_request'" if: "github.event_name == 'pull_request'"
strategy: strategy:
matrix: matrix:
name:
- mingw-check
- x86_64-gnu-llvm-8
- x86_64-gnu-tools
include: include:
- name: mingw-check - name: mingw-check
os: ubuntu-latest-xl os: ubuntu-latest-xl
@ -68,79 +67,60 @@ jobs:
run: src/ci/scripts/setup-environment.sh run: src/ci/scripts/setup-environment.sh
env: env:
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}" EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: decide whether to skip this job - name: decide whether to skip this job
run: src/ci/scripts/should-skip-this.sh run: src/ci/scripts/should-skip-this.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: collect CPU statistics - name: collect CPU statistics
run: src/ci/scripts/collect-cpu-stats.sh run: src/ci/scripts/collect-cpu-stats.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: show the current environment - name: show the current environment
run: src/ci/scripts/dump-environment.sh run: src/ci/scripts/dump-environment.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install awscli - name: install awscli
run: src/ci/scripts/install-awscli.sh run: src/ci/scripts/install-awscli.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install sccache - name: install sccache
run: src/ci/scripts/install-sccache.sh run: src/ci/scripts/install-sccache.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install clang - name: install clang
run: src/ci/scripts/install-clang.sh run: src/ci/scripts/install-clang.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install WIX - name: install WIX
run: src/ci/scripts/install-wix.sh run: src/ci/scripts/install-wix.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install InnoSetup - name: install InnoSetup
run: src/ci/scripts/install-innosetup.sh run: src/ci/scripts/install-innosetup.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: ensure the build happens on a partition with enough space - name: ensure the build happens on a partition with enough space
run: src/ci/scripts/symlink-build-dir.sh run: src/ci/scripts/symlink-build-dir.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: disable git crlf conversion - name: disable git crlf conversion
run: src/ci/scripts/disable-git-crlf-conversion.sh run: src/ci/scripts/disable-git-crlf-conversion.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install MSYS2 - name: install MSYS2
run: src/ci/scripts/install-msys2.sh run: src/ci/scripts/install-msys2.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install MSYS2 packages - name: install MSYS2 packages
run: src/ci/scripts/install-msys2-packages.sh run: src/ci/scripts/install-msys2-packages.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install MinGW - name: install MinGW
run: src/ci/scripts/install-mingw.sh run: src/ci/scripts/install-mingw.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install ninja - name: install ninja
run: src/ci/scripts/install-ninja.sh run: src/ci/scripts/install-ninja.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: enable ipv6 on Docker - name: enable ipv6 on Docker
run: src/ci/scripts/enable-docker-ipv6.sh run: src/ci/scripts/enable-docker-ipv6.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: disable git crlf conversion - name: disable git crlf conversion
run: src/ci/scripts/disable-git-crlf-conversion.sh run: src/ci/scripts/disable-git-crlf-conversion.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: checkout submodules - name: checkout submodules
run: src/ci/scripts/checkout-submodules.sh run: src/ci/scripts/checkout-submodules.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: ensure line endings are correct - name: ensure line endings are correct
run: src/ci/scripts/verify-line-endings.sh run: src/ci/scripts/verify-line-endings.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: run the build - name: run the build
run: src/ci/scripts/run-build-from-ci.sh run: src/ci/scripts/run-build-from-ci.sh
@ -148,7 +128,6 @@ jobs:
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}" AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}" AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}" TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: upload artifacts to S3 - name: upload artifacts to S3
run: src/ci/scripts/upload-artifacts.sh run: src/ci/scripts/upload-artifacts.sh
@ -156,7 +135,6 @@ jobs:
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}" AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}" AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')" if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')"
shell: "python src/ci/exec-with-shell.py {0}"
try: try:
name: try name: try
env: env:
@ -171,9 +149,6 @@ jobs:
if: "github.event_name == 'push' && github.ref == 'refs/heads/try' && github.repository == 'rust-lang-ci/rust'" if: "github.event_name == 'push' && github.ref == 'refs/heads/try' && github.repository == 'rust-lang-ci/rust'"
strategy: strategy:
matrix: matrix:
name:
- dist-x86_64-linux
- dist-x86_64-linux-alt
include: include:
- name: dist-x86_64-linux - name: dist-x86_64-linux
os: ubuntu-latest-xl os: ubuntu-latest-xl
@ -201,79 +176,60 @@ jobs:
run: src/ci/scripts/setup-environment.sh run: src/ci/scripts/setup-environment.sh
env: env:
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}" EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: decide whether to skip this job - name: decide whether to skip this job
run: src/ci/scripts/should-skip-this.sh run: src/ci/scripts/should-skip-this.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: collect CPU statistics - name: collect CPU statistics
run: src/ci/scripts/collect-cpu-stats.sh run: src/ci/scripts/collect-cpu-stats.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: show the current environment - name: show the current environment
run: src/ci/scripts/dump-environment.sh run: src/ci/scripts/dump-environment.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install awscli - name: install awscli
run: src/ci/scripts/install-awscli.sh run: src/ci/scripts/install-awscli.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install sccache - name: install sccache
run: src/ci/scripts/install-sccache.sh run: src/ci/scripts/install-sccache.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install clang - name: install clang
run: src/ci/scripts/install-clang.sh run: src/ci/scripts/install-clang.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install WIX - name: install WIX
run: src/ci/scripts/install-wix.sh run: src/ci/scripts/install-wix.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install InnoSetup - name: install InnoSetup
run: src/ci/scripts/install-innosetup.sh run: src/ci/scripts/install-innosetup.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: ensure the build happens on a partition with enough space - name: ensure the build happens on a partition with enough space
run: src/ci/scripts/symlink-build-dir.sh run: src/ci/scripts/symlink-build-dir.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: disable git crlf conversion - name: disable git crlf conversion
run: src/ci/scripts/disable-git-crlf-conversion.sh run: src/ci/scripts/disable-git-crlf-conversion.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install MSYS2 - name: install MSYS2
run: src/ci/scripts/install-msys2.sh run: src/ci/scripts/install-msys2.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install MSYS2 packages - name: install MSYS2 packages
run: src/ci/scripts/install-msys2-packages.sh run: src/ci/scripts/install-msys2-packages.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install MinGW - name: install MinGW
run: src/ci/scripts/install-mingw.sh run: src/ci/scripts/install-mingw.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install ninja - name: install ninja
run: src/ci/scripts/install-ninja.sh run: src/ci/scripts/install-ninja.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: enable ipv6 on Docker - name: enable ipv6 on Docker
run: src/ci/scripts/enable-docker-ipv6.sh run: src/ci/scripts/enable-docker-ipv6.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: disable git crlf conversion - name: disable git crlf conversion
run: src/ci/scripts/disable-git-crlf-conversion.sh run: src/ci/scripts/disable-git-crlf-conversion.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: checkout submodules - name: checkout submodules
run: src/ci/scripts/checkout-submodules.sh run: src/ci/scripts/checkout-submodules.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: ensure line endings are correct - name: ensure line endings are correct
run: src/ci/scripts/verify-line-endings.sh run: src/ci/scripts/verify-line-endings.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: run the build - name: run the build
run: src/ci/scripts/run-build-from-ci.sh run: src/ci/scripts/run-build-from-ci.sh
@ -281,7 +237,6 @@ jobs:
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}" AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}" AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}" TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: upload artifacts to S3 - name: upload artifacts to S3
run: src/ci/scripts/upload-artifacts.sh run: src/ci/scripts/upload-artifacts.sh
@ -289,7 +244,6 @@ jobs:
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}" AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}" AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')" if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')"
shell: "python src/ci/exec-with-shell.py {0}"
auto: auto:
name: auto name: auto
env: env:
@ -304,64 +258,6 @@ jobs:
if: "github.event_name == 'push' && github.ref == 'refs/heads/auto' && github.repository == 'rust-lang-ci/rust'" if: "github.event_name == 'push' && github.ref == 'refs/heads/auto' && github.repository == 'rust-lang-ci/rust'"
strategy: strategy:
matrix: matrix:
name:
- arm-android
- armhf-gnu
- dist-aarch64-linux
- dist-android
- dist-arm-linux
- dist-armhf-linux
- dist-armv7-linux
- dist-i586-gnu-i586-i686-musl
- dist-i686-freebsd
- dist-i686-linux
- dist-i686-mingw
- dist-i686-msvc
- dist-mips-linux
- dist-mips64-linux
- dist-mips64el-linux
- dist-mipsel-linux
- dist-powerpc-linux
- dist-powerpc64-linux
- dist-powerpc64le-linux
- dist-s390x-linux
- dist-various-1
- dist-various-2
- dist-x86_64-apple
- dist-x86_64-apple-alt
- dist-x86_64-freebsd
- dist-x86_64-linux
- dist-x86_64-linux-alt
- dist-x86_64-mingw
- dist-x86_64-msvc
- dist-x86_64-msvc-alt
- dist-x86_64-musl
- dist-x86_64-netbsd
- i686-gnu
- i686-gnu-nopt
- i686-mingw-1
- i686-mingw-2
- i686-msvc-1
- i686-msvc-2
- mingw-check
- test-various
- wasm32
- x86_64-apple
- x86_64-gnu
- x86_64-gnu-aux
- x86_64-gnu-debug
- x86_64-gnu-distcheck
- x86_64-gnu-full-bootstrap
- x86_64-gnu-llvm-8
- x86_64-gnu-nopt
- x86_64-gnu-tools
- x86_64-mingw-1
- x86_64-mingw-2
- x86_64-msvc-1
- x86_64-msvc-2
- x86_64-msvc-aux
- x86_64-msvc-cargo
- x86_64-msvc-tools
include: include:
- name: arm-android - name: arm-android
os: ubuntu-latest-xl os: ubuntu-latest-xl
@ -631,79 +527,60 @@ jobs:
run: src/ci/scripts/setup-environment.sh run: src/ci/scripts/setup-environment.sh
env: env:
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}" EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: decide whether to skip this job - name: decide whether to skip this job
run: src/ci/scripts/should-skip-this.sh run: src/ci/scripts/should-skip-this.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: collect CPU statistics - name: collect CPU statistics
run: src/ci/scripts/collect-cpu-stats.sh run: src/ci/scripts/collect-cpu-stats.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: show the current environment - name: show the current environment
run: src/ci/scripts/dump-environment.sh run: src/ci/scripts/dump-environment.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install awscli - name: install awscli
run: src/ci/scripts/install-awscli.sh run: src/ci/scripts/install-awscli.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install sccache - name: install sccache
run: src/ci/scripts/install-sccache.sh run: src/ci/scripts/install-sccache.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install clang - name: install clang
run: src/ci/scripts/install-clang.sh run: src/ci/scripts/install-clang.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install WIX - name: install WIX
run: src/ci/scripts/install-wix.sh run: src/ci/scripts/install-wix.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install InnoSetup - name: install InnoSetup
run: src/ci/scripts/install-innosetup.sh run: src/ci/scripts/install-innosetup.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: ensure the build happens on a partition with enough space - name: ensure the build happens on a partition with enough space
run: src/ci/scripts/symlink-build-dir.sh run: src/ci/scripts/symlink-build-dir.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: disable git crlf conversion - name: disable git crlf conversion
run: src/ci/scripts/disable-git-crlf-conversion.sh run: src/ci/scripts/disable-git-crlf-conversion.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install MSYS2 - name: install MSYS2
run: src/ci/scripts/install-msys2.sh run: src/ci/scripts/install-msys2.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install MSYS2 packages - name: install MSYS2 packages
run: src/ci/scripts/install-msys2-packages.sh run: src/ci/scripts/install-msys2-packages.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install MinGW - name: install MinGW
run: src/ci/scripts/install-mingw.sh run: src/ci/scripts/install-mingw.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: install ninja - name: install ninja
run: src/ci/scripts/install-ninja.sh run: src/ci/scripts/install-ninja.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: enable ipv6 on Docker - name: enable ipv6 on Docker
run: src/ci/scripts/enable-docker-ipv6.sh run: src/ci/scripts/enable-docker-ipv6.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: disable git crlf conversion - name: disable git crlf conversion
run: src/ci/scripts/disable-git-crlf-conversion.sh run: src/ci/scripts/disable-git-crlf-conversion.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: checkout submodules - name: checkout submodules
run: src/ci/scripts/checkout-submodules.sh run: src/ci/scripts/checkout-submodules.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: ensure line endings are correct - name: ensure line endings are correct
run: src/ci/scripts/verify-line-endings.sh run: src/ci/scripts/verify-line-endings.sh
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: run the build - name: run the build
run: src/ci/scripts/run-build-from-ci.sh run: src/ci/scripts/run-build-from-ci.sh
@ -711,7 +588,6 @@ jobs:
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}" AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}" AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}" TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: upload artifacts to S3 - name: upload artifacts to S3
run: src/ci/scripts/upload-artifacts.sh run: src/ci/scripts/upload-artifacts.sh
@ -719,7 +595,6 @@ jobs:
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}" AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}" AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')" if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')"
shell: "python src/ci/exec-with-shell.py {0}"
master: master:
name: master name: master
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -741,7 +616,6 @@ jobs:
run: src/ci/publish_toolstate.sh run: src/ci/publish_toolstate.sh
env: env:
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}" TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
shell: "python src/ci/exec-with-shell.py {0}"
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
try-success: try-success:
needs: needs:

139
src/ci/github-actions/ci.yml
View File

@ -70,21 +70,6 @@ x--expand-yaml-anchors--remove:
- &step - &step
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- &step-run
<<: *step
# While on Linux and macOS builders it just forwards the arguments to the
# system bash, this wrapper allows switching from the host's bash.exe to
# the one we install along with MSYS2 mid-build on Windows.
#
# Once the step to install MSYS2 is executed, the CI_OVERRIDE_SHELL
# environment variable is set pointing to our MSYS2's bash.exe. From that
# moment the host's bash.exe will not be called anymore.
#
# This is needed because we can't launch our own bash.exe from the host
# bash.exe, as that would load two different cygwin1.dll in memory, causing
# "cygwin heap mismatch" errors.
shell: python src/ci/exec-with-shell.py {0}
- &base-ci-job - &base-ci-job
timeout-minutes: 600 timeout-minutes: 600
runs-on: "${{ matrix.os }}" runs-on: "${{ matrix.os }}"
@ -114,67 +99,67 @@ x--expand-yaml-anchors--remove:
# are passed to the `setup-environment.sh` script encoded in JSON, # are passed to the `setup-environment.sh` script encoded in JSON,
# which then uses log commands to actually set them. # which then uses log commands to actually set them.
EXTRA_VARIABLES: ${{ toJson(matrix.env) }} EXTRA_VARIABLES: ${{ toJson(matrix.env) }}
<<: *step-run <<: *step
- name: decide whether to skip this job - name: decide whether to skip this job
run: src/ci/scripts/should-skip-this.sh run: src/ci/scripts/should-skip-this.sh
<<: *step-run <<: *step
- name: collect CPU statistics - name: collect CPU statistics
run: src/ci/scripts/collect-cpu-stats.sh run: src/ci/scripts/collect-cpu-stats.sh
<<: *step-run <<: *step
- name: show the current environment - name: show the current environment
run: src/ci/scripts/dump-environment.sh run: src/ci/scripts/dump-environment.sh
<<: *step-run <<: *step
- name: install awscli - name: install awscli
run: src/ci/scripts/install-awscli.sh run: src/ci/scripts/install-awscli.sh
<<: *step-run <<: *step
- name: install sccache - name: install sccache
run: src/ci/scripts/install-sccache.sh run: src/ci/scripts/install-sccache.sh
<<: *step-run <<: *step
- name: install clang - name: install clang
run: src/ci/scripts/install-clang.sh run: src/ci/scripts/install-clang.sh
<<: *step-run <<: *step
- name: install WIX - name: install WIX
run: src/ci/scripts/install-wix.sh run: src/ci/scripts/install-wix.sh
<<: *step-run <<: *step
- name: install InnoSetup - name: install InnoSetup
run: src/ci/scripts/install-innosetup.sh run: src/ci/scripts/install-innosetup.sh
<<: *step-run <<: *step
- name: ensure the build happens on a partition with enough space - name: ensure the build happens on a partition with enough space
run: src/ci/scripts/symlink-build-dir.sh run: src/ci/scripts/symlink-build-dir.sh
<<: *step-run <<: *step
- name: disable git crlf conversion - name: disable git crlf conversion
run: src/ci/scripts/disable-git-crlf-conversion.sh run: src/ci/scripts/disable-git-crlf-conversion.sh
<<: *step-run <<: *step
- name: install MSYS2 - name: install MSYS2
run: src/ci/scripts/install-msys2.sh run: src/ci/scripts/install-msys2.sh
<<: *step-run <<: *step
- name: install MSYS2 packages - name: install MSYS2 packages
run: src/ci/scripts/install-msys2-packages.sh run: src/ci/scripts/install-msys2-packages.sh
<<: *step-run <<: *step
- name: install MinGW - name: install MinGW
run: src/ci/scripts/install-mingw.sh run: src/ci/scripts/install-mingw.sh
<<: *step-run <<: *step
- name: install ninja - name: install ninja
run: src/ci/scripts/install-ninja.sh run: src/ci/scripts/install-ninja.sh
<<: *step-run <<: *step
- name: enable ipv6 on Docker - name: enable ipv6 on Docker
run: src/ci/scripts/enable-docker-ipv6.sh run: src/ci/scripts/enable-docker-ipv6.sh
<<: *step-run <<: *step
# Disable automatic line ending conversion (again). On Windows, when we're # Disable automatic line ending conversion (again). On Windows, when we're
# installing dependencies, something switches the git configuration directory or # installing dependencies, something switches the git configuration directory or
@ -183,15 +168,15 @@ x--expand-yaml-anchors--remove:
# appropriate line endings. # appropriate line endings.
- name: disable git crlf conversion - name: disable git crlf conversion
run: src/ci/scripts/disable-git-crlf-conversion.sh run: src/ci/scripts/disable-git-crlf-conversion.sh
<<: *step-run <<: *step
- name: checkout submodules - name: checkout submodules
run: src/ci/scripts/checkout-submodules.sh run: src/ci/scripts/checkout-submodules.sh
<<: *step-run <<: *step
- name: ensure line endings are correct - name: ensure line endings are correct
run: src/ci/scripts/verify-line-endings.sh run: src/ci/scripts/verify-line-endings.sh
<<: *step-run <<: *step
- name: run the build - name: run the build
run: src/ci/scripts/run-build-from-ci.sh run: src/ci/scripts/run-build-from-ci.sh
@ -199,7 +184,7 @@ x--expand-yaml-anchors--remove:
AWS_ACCESS_KEY_ID: ${{ env.CACHES_AWS_ACCESS_KEY_ID }} AWS_ACCESS_KEY_ID: ${{ env.CACHES_AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }} AWS_SECRET_ACCESS_KEY: ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}
TOOLSTATE_REPO_ACCESS_TOKEN: ${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }} TOOLSTATE_REPO_ACCESS_TOKEN: ${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}
<<: *step-run <<: *step
- name: upload artifacts to S3 - name: upload artifacts to S3
run: src/ci/scripts/upload-artifacts.sh run: src/ci/scripts/upload-artifacts.sh
@ -212,7 +197,7 @@ x--expand-yaml-anchors--remove:
# deploying artifacts from a dist builder if the variables are misconfigured, # deploying artifacts from a dist builder if the variables are misconfigured,
# erroring about invalid credentials instead. # erroring about invalid credentials instead.
if: success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1') if: success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')
<<: *step-run <<: *step
# These snippets are used by the try-success, try-failure, auto-success and auto-failure jobs. # These snippets are used by the try-success, try-failure, auto-success and auto-failure jobs.
# Check out their documentation for more information on why they're needed. # Check out their documentation for more information on why they're needed.
@ -248,6 +233,21 @@ on:
branches: branches:
- "**" - "**"
defaults:
run:
# While on Linux and macOS builders it just forwards the arguments to the
# system bash, this wrapper allows switching from the host's bash.exe to
# the one we install along with MSYS2 mid-build on Windows.
#
# Once the step to install MSYS2 is executed, the CI_OVERRIDE_SHELL
# environment variable is set pointing to our MSYS2's bash.exe. From that
# moment the host's bash.exe will not be called anymore.
#
# This is needed because we can't launch our own bash.exe from the host
# bash.exe, as that would load two different cygwin1.dll in memory, causing
# "cygwin heap mismatch" errors.
shell: python src/ci/exec-with-shell.py {0}
jobs: jobs:
pr: pr:
<<: *base-ci-job <<: *base-ci-job
@ -257,10 +257,6 @@ jobs:
if: github.event_name == 'pull_request' if: github.event_name == 'pull_request'
strategy: strategy:
matrix: matrix:
name:
- mingw-check
- x86_64-gnu-llvm-8
- x86_64-gnu-tools
include: include:
- name: mingw-check - name: mingw-check
<<: *job-linux-xl <<: *job-linux-xl
@ -281,9 +277,6 @@ jobs:
if: github.event_name == 'push' && github.ref == 'refs/heads/try' && github.repository == 'rust-lang-ci/rust' if: github.event_name == 'push' && github.ref == 'refs/heads/try' && github.repository == 'rust-lang-ci/rust'
strategy: strategy:
matrix: matrix:
name:
- dist-x86_64-linux
- dist-x86_64-linux-alt
include: include:
- name: dist-x86_64-linux - name: dist-x86_64-linux
<<: *job-linux-xl <<: *job-linux-xl
@ -301,64 +294,6 @@ jobs:
if: github.event_name == 'push' && github.ref == 'refs/heads/auto' && github.repository == 'rust-lang-ci/rust' if: github.event_name == 'push' && github.ref == 'refs/heads/auto' && github.repository == 'rust-lang-ci/rust'
strategy: strategy:
matrix: matrix:
name:
- arm-android
- armhf-gnu
- dist-aarch64-linux
- dist-android
- dist-arm-linux
- dist-armhf-linux
- dist-armv7-linux
- dist-i586-gnu-i586-i686-musl
- dist-i686-freebsd
- dist-i686-linux
- dist-i686-mingw
- dist-i686-msvc
- dist-mips-linux
- dist-mips64-linux
- dist-mips64el-linux
- dist-mipsel-linux
- dist-powerpc-linux
- dist-powerpc64-linux
- dist-powerpc64le-linux
- dist-s390x-linux
- dist-various-1
- dist-various-2
- dist-x86_64-apple
- dist-x86_64-apple-alt
- dist-x86_64-freebsd
- dist-x86_64-linux
- dist-x86_64-linux-alt
- dist-x86_64-mingw
- dist-x86_64-msvc
- dist-x86_64-msvc-alt
- dist-x86_64-musl
- dist-x86_64-netbsd
- i686-gnu
- i686-gnu-nopt
- i686-mingw-1
- i686-mingw-2
- i686-msvc-1
- i686-msvc-2
- mingw-check
- test-various
- wasm32
- x86_64-apple
- x86_64-gnu
- x86_64-gnu-aux
- x86_64-gnu-debug
- x86_64-gnu-distcheck
- x86_64-gnu-full-bootstrap
- x86_64-gnu-llvm-8
- x86_64-gnu-nopt
- x86_64-gnu-tools
- x86_64-mingw-1
- x86_64-mingw-2
- x86_64-msvc-1
- x86_64-msvc-2
- x86_64-msvc-aux
- x86_64-msvc-cargo
- x86_64-msvc-tools
include: include:
############################# #############################
# Linux/Docker builders # # Linux/Docker builders #
@ -687,7 +622,7 @@ jobs:
run: src/ci/publish_toolstate.sh run: src/ci/publish_toolstate.sh
env: env:
TOOLSTATE_REPO_ACCESS_TOKEN: ${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }} TOOLSTATE_REPO_ACCESS_TOKEN: ${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}
<<: *step-run <<: *step
# These jobs don't actually test anything, but they're used to tell bors the # These jobs don't actually test anything, but they're used to tell bors the
# build completed, as there is no practical way to detect when a workflow is # build completed, as there is no practical way to detect when a workflow is