-
Notifications
You must be signed in to change notification settings - Fork 13.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use a dynamic environment for PR jobs
- Loading branch information
Showing
15 changed files
with
104 additions
and
189 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,23 +45,23 @@ jobs: | |
| - name: Checkout the source code | ||
| uses: actions/checkout@v4 | ||
| - name: Calculate the CI job matrix | ||
| run: python3 src/ci/scripts/calculate-job-matrix.py >> $GITHUB_OUTPUT | ||
| env: | ||
| GITHUB_CTX: "${{ toJSON(github) }}" | ||
| run: python3 src/ci/github-actions/calculate-job-matrix.py >> $GITHUB_OUTPUT | ||
| id: jobs | ||
| pr: | ||
| name: "PR - ${{ matrix.name }}" | ||
| job: | ||
| name: "${{ matrix.name }}" | ||
| needs: | ||
| - calculate_matrix | ||
| env: | ||
| PR_CI_JOB: 1 | ||
| CI_JOB_NAME: "${{ matrix.name }}" | ||
| CI_JOB_NAME: "${{ matrix.image }}" | ||
| CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse | ||
| HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}" | ||
| DOCKER_TOKEN: "${{ secrets.GITHUB_TOKEN }}" | ||
| SCCACHE_BUCKET: rust-lang-ci-sccache2 | ||
| TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate" | ||
| CACHE_DOMAIN: ci-caches.rust-lang.org | ||
| if: "github.event_name == 'pull_request'" | ||
| continue-on-error: "${{ matrix.name == 'mingw-check-tidy' }}" | ||
| continue-on-error: "${{ matrix.continue_on_error || false }}" | ||
| strategy: | ||
| matrix: | ||
| include: "${{ fromJSON(needs.calculate_matrix.outputs.jobs) }}" | ||
|
|
@@ -589,145 +589,6 @@ jobs: | |
| 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)] }}" | ||
| if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')" | ||
| try: | ||
| name: "try - ${{ matrix.name }}" | ||
| env: | ||
| DIST_TRY_BUILD: 1 | ||
| CI_JOB_NAME: "${{ matrix.name }}" | ||
| CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse | ||
| HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}" | ||
| DOCKER_TOKEN: "${{ secrets.GITHUB_TOKEN }}" | ||
| SCCACHE_BUCKET: rust-lang-ci-sccache2 | ||
| DEPLOY_BUCKET: rust-lang-ci2 | ||
| TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate" | ||
| TOOLSTATE_ISSUES_API_URL: "https://api.github.com/repos/rust-lang/rust/issues" | ||
| TOOLSTATE_PUBLISH: 1 | ||
| CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZI5DHEBFL | ||
| ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55 | ||
| AWS_REGION: us-west-1 | ||
| CACHE_DOMAIN: ci-caches.rust-lang.org | ||
| if: "github.event_name == 'push' && (((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust') || ((github.ref == 'refs/heads/automation/bors/try') && github.repository == 'rust-lang/rust'))" | ||
| strategy: | ||
| matrix: | ||
| include: | ||
| - name: dist-x86_64-linux | ||
| env: | ||
| CODEGEN_BACKENDS: "llvm,cranelift" | ||
| os: ubuntu-20.04-16core-64gb | ||
| defaults: | ||
| run: | ||
| shell: "${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}" | ||
| timeout-minutes: 600 | ||
| runs-on: "${{ matrix.os }}" | ||
| steps: | ||
| - if: "contains(matrix.os, 'windows')" | ||
| uses: msys2/[email protected] | ||
| with: | ||
| msystem: "${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}" | ||
| update: false | ||
| release: true | ||
| path-type: inherit | ||
| install: "make dos2unix diffutils\n" | ||
| - name: disable git crlf conversion | ||
| run: git config --global core.autocrlf false | ||
| - name: checkout the source code | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 2 | ||
| - name: configure the PR in which the error message will be posted | ||
| run: "echo \"[CI_PR_NUMBER=$num]\"" | ||
| env: | ||
| num: "${{ github.event.number }}" | ||
| if: "success() && !env.SKIP_JOB && github.event_name == 'pull_request'" | ||
| - name: add extra environment variables | ||
| run: src/ci/scripts/setup-environment.sh | ||
| env: | ||
| EXTRA_VARIABLES: "${{ toJson(matrix.env) }}" | ||
| if: success() && !env.SKIP_JOB | ||
| - name: decide whether to skip this job | ||
| run: src/ci/scripts/should-skip-this.sh | ||
| if: success() && !env.SKIP_JOB | ||
| - name: ensure the channel matches the target branch | ||
| run: src/ci/scripts/verify-channel.sh | ||
| if: success() && !env.SKIP_JOB | ||
| - name: collect CPU statistics | ||
| run: src/ci/scripts/collect-cpu-stats.sh | ||
| if: success() && !env.SKIP_JOB | ||
| - name: show the current environment | ||
| run: src/ci/scripts/dump-environment.sh | ||
| if: success() && !env.SKIP_JOB | ||
| - name: install awscli | ||
| run: src/ci/scripts/install-awscli.sh | ||
| if: success() && !env.SKIP_JOB | ||
| - name: install sccache | ||
| run: src/ci/scripts/install-sccache.sh | ||
| if: success() && !env.SKIP_JOB | ||
| - name: select Xcode | ||
| run: src/ci/scripts/select-xcode.sh | ||
| if: success() && !env.SKIP_JOB | ||
| - name: install clang | ||
| run: src/ci/scripts/install-clang.sh | ||
| if: success() && !env.SKIP_JOB | ||
| - name: install tidy | ||
| run: src/ci/scripts/install-tidy.sh | ||
| if: success() && !env.SKIP_JOB | ||
| - name: install WIX | ||
| run: src/ci/scripts/install-wix.sh | ||
| if: success() && !env.SKIP_JOB | ||
| - name: disable git crlf conversion | ||
| run: src/ci/scripts/disable-git-crlf-conversion.sh | ||
| if: success() && !env.SKIP_JOB | ||
| - name: checkout submodules | ||
| run: src/ci/scripts/checkout-submodules.sh | ||
| if: success() && !env.SKIP_JOB | ||
| - name: install MSYS2 | ||
| run: src/ci/scripts/install-msys2.sh | ||
| if: success() && !env.SKIP_JOB | ||
| - name: install MinGW | ||
| run: src/ci/scripts/install-mingw.sh | ||
| if: success() && !env.SKIP_JOB | ||
| - name: install ninja | ||
| run: src/ci/scripts/install-ninja.sh | ||
| if: success() && !env.SKIP_JOB | ||
| - name: enable ipv6 on Docker | ||
| run: src/ci/scripts/enable-docker-ipv6.sh | ||
| if: success() && !env.SKIP_JOB | ||
| - name: disable git crlf conversion | ||
| run: src/ci/scripts/disable-git-crlf-conversion.sh | ||
| if: success() && !env.SKIP_JOB | ||
| - name: ensure line endings are correct | ||
| run: src/ci/scripts/verify-line-endings.sh | ||
| if: success() && !env.SKIP_JOB | ||
| - name: ensure backported commits are in upstream branches | ||
| run: src/ci/scripts/verify-backported-commits.sh | ||
| if: success() && !env.SKIP_JOB | ||
| - name: ensure the stable version number is correct | ||
| run: src/ci/scripts/verify-stable-version-number.sh | ||
| if: success() && !env.SKIP_JOB | ||
| - name: run the build | ||
| run: src/ci/scripts/run-build-from-ci.sh 2>&1 | ||
| env: | ||
| 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)] }}" | ||
| TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}" | ||
| if: success() && !env.SKIP_JOB | ||
| - name: create github artifacts | ||
| run: src/ci/scripts/create-doc-artifacts.sh | ||
| if: success() && !env.SKIP_JOB | ||
| - name: upload artifacts to github | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: "${{ env.DOC_ARTIFACT_NAME }}" | ||
| path: obj/artifacts/doc | ||
| if-no-files-found: ignore | ||
| retention-days: 5 | ||
| if: success() && !env.SKIP_JOB | ||
| - name: upload artifacts to S3 | ||
| run: src/ci/scripts/upload-artifacts.sh | ||
| env: | ||
| 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)] }}" | ||
| if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')" | ||
| master: | ||
| name: master | ||
| runs-on: ubuntu-latest | ||
|
|
||
Submodule backtrace
updated
10 files
| +2 −3 | .github/workflows/check-binary-size.yml | |
| +5 −14 | .github/workflows/main.yml | |
| +8 −1 | Cargo.lock | |
| +8 −8 | Cargo.toml | |
| +20 −33 | src/backtrace/dbghelp64.rs | |
| +49 −0 | src/capture.rs | |
| +2 −0 | src/lib.rs | |
| +1 −8 | src/symbolize/dbghelp.rs | |
| +5 −2 | src/symbolize/gimli.rs | |
| +12 −0 | tests/smoke.rs |
Submodule stdarch
updated
5 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule book
updated
28 files
Submodule edition-guide
updated
3 files
| +0 −2 | book.toml | |
| +1 −1 | src/editions/advanced-migrations.md | |
| +61 −35 | src/editions/index.md |
Submodule reference
updated
4 files
| +1 −4 | src/attributes.md | |
| +0 −70 | src/attributes/diagnostics.md | |
| +2 −2 | src/procedural-macros.md | |
| +2 −2 | src/type-layout.md |
Submodule rustc-dev-guide
updated
26 files
| +6 −0 | .github/workflows/ci.yml | |
| +19 −0 | README.md | |
| +43 −0 | ci/lengthcheck.sh | |
| +1 −7 | src/SUMMARY.md | |
| +1 −1 | src/appendix/glossary.md | |
| +1 −1 | src/backend/debugging.md | |
| +1 −1 | src/backend/libs-and-metadata.md | |
| +0 −264 | src/borrow_check/opaque-types-region-inference-restrictions.md | |
| +4 −4 | src/building/bootstrapping/what-bootstrapping-does.md | |
| +0 −5 | src/building/how-to-build-and-run.md | |
| +0 −64 | src/building/quickstart.md | |
| +1 −1 | src/building/suggested.md | |
| +1 −1 | src/compiler-src.md | |
| +3 −3 | src/contributing.md | |
| +1 −1 | src/git.md | |
| +1 −1 | src/overview.md | |
| +69 −0 | src/param_env.md | |
| +0 −44 | src/param_env/param_env_acquisition.md | |
| +0 −83 | src/param_env/param_env_construction_internals.md | |
| +0 −18 | src/param_env/param_env_summary.md | |
| +0 −60 | src/param_env/param_env_what_is_it.md | |
| +36 −148 | src/rustdoc-internals/search.md | |
| +1 −1 | src/solve/invariants.md | |
| +1 −9 | src/tests/compiletest.md | |
| +0 −1 | src/tests/headers.md | |
| +1 −1 | src/what-does-early-late-bound-mean.md |
Submodule llvm-project
updated
82 files