diff options
| author | bors <bors@rust-lang.org> | 2021-03-01 08:22:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-03-01 08:22:06 +0000 |
| commit | d2731d8e9338d8fe844e19d3fbb39617753e65f4 (patch) | |
| tree | ad528516bfd655a1c9e08731080484a8fc4c4994 /src/ci/github-actions | |
| parent | 05c300144cebbf3ddaff213b7485f669a9e0b660 (diff) | |
| parent | e2d8efb997f8decf2269366e3c9c9119d6a82e18 (diff) | |
| download | rust-d2731d8e9338d8fe844e19d3fbb39617753e65f4.tar.gz rust-d2731d8e9338d8fe844e19d3fbb39617753e65f4.zip | |
Auto merge of #82654 - JohnTitor:rollup-nkcdkzp, r=JohnTitor
Rollup of 10 pull requests Successful merges: - #82309 (Propagate RUSTDOCFLAGS in the environment when documenting) - #82403 (rustbuild: print out env vars on verbose rustc invocations) - #82507 (Rename the `tidy` binary to `rust-tidy`) - #82531 (Add GUI tests) - #82532 (Add `build.print_step_rusage` to config.toml) - #82543 (fix env var name in CI) - #82622 (Propagate `--test-args` for `x.py test src/tools/cargo`) - #82628 (Try to clarify GlobalAlloc::realloc documentation comment.) - #82630 (Fix a typo in the `find_anon_type` doc) - #82643 (Add more proc-macro attribute tests) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/github-actions')
| -rw-r--r-- | src/ci/github-actions/ci.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 5b9b7795c1b..7125b33699a 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -110,7 +110,7 @@ x--expand-yaml-anchors--remove: run: echo "[CI_PR_NUMBER=$num]" env: num: ${{ github.event.number }} - if: success() && !env.SKIP_JOBS && github.event_name == 'pull_request' + if: success() && !env.SKIP_JOB && github.event_name == 'pull_request' - name: add extra environment variables run: src/ci/scripts/setup-environment.sh |