Skip to content

Commit

Permalink
Auto merge of rust-lang#125145 - Kobzol:ci-toolstate, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
CI: fix toolstate publishing

Toolstate publishing after something broke was not working (discovered [here](rust-lang#124050 (comment))). The toolstate env. vars should only be needed for the publishing step, so I moved them there.

The toolstate script is also being checked in `mingw-check` on PR and auto CI, but it doesn't really seem to do anything, and it shouldn't require the token.
  • Loading branch information
bors committed May 19, 2024
2 parents 7c73595 + 7b6a3d0 commit 84b9b6d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,6 @@ jobs:
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 }}

- name: create github artifacts
run: src/ci/scripts/create-doc-artifacts.sh
Expand Down Expand Up @@ -241,3 +240,5 @@ jobs:
if: needs.calculate_matrix.outputs.run_type == 'auto'
env:
TOOLSTATE_REPO_ACCESS_TOKEN: ${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}
TOOLSTATE_ISSUES_API_URL: https://api.github.com/repos/rust-lang/rust/issues
TOOLSTATE_PUBLISH: 1
2 changes: 0 additions & 2 deletions src/ci/github-actions/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ envs:
production:
&production
DEPLOY_BUCKET: rust-lang-ci2
TOOLSTATE_ISSUES_API_URL: https://api.github.com/repos/rust-lang/rust/issues
TOOLSTATE_PUBLISH: 1
# AWS_SECRET_ACCESS_KEYs are stored in GitHub's secrets storage, named
# AWS_SECRET_ACCESS_KEY_<keyid>. Including the key id in the name allows to
# rotate them in a single branch while keeping the old key in another
Expand Down
3 changes: 1 addition & 2 deletions src/tools/publish_toolstate.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@

# This script computes the new "current" toolstate for the toolstate repo (not to be
# confused with publishing the test results, which happens in `src/bootstrap/toolstate.rs`).
# It gets called from `src/ci/publish_toolstate.sh` when a new commit lands on `master`
# (i.e., after it passed all checks on `auto`).
# It gets called from `src/ci/publish_toolstate.sh` at the end of an `auto` build.

from __future__ import print_function

Expand Down

0 comments on commit 84b9b6d

Please sign in to comment.