diff options
| author | Oli Scherer <github35764891676564198441@oli-obk.de> | 2025-01-31 06:12:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-31 06:12:43 +0000 |
| commit | bcda8927d010915dd50991cda41d01ee16e545ee (patch) | |
| tree | 2f5b7438dad8635d3d521bb0d04428eed0c4b2cd /src/doc/rustc-dev-guide/.github/workflows | |
| parent | e1d050732198114a28cca6749375236cab5b21e8 (diff) | |
| parent | 74ca1cfb2aec94ae9e6c277b20c2caa4588c9993 (diff) | |
| download | rust-bcda8927d010915dd50991cda41d01ee16e545ee.tar.gz rust-bcda8927d010915dd50991cda41d01ee16e545ee.zip | |
Merge pull request #4166 from rust-lang/rustup-2025-01-31
Automatic Rustup
Diffstat (limited to 'src/doc/rustc-dev-guide/.github/workflows')
| -rw-r--r-- | src/doc/rustc-dev-guide/.github/workflows/ci.yml | 6 | ||||
| -rw-r--r-- | src/doc/rustc-dev-guide/.github/workflows/rustc-pull.yml | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/doc/rustc-dev-guide/.github/workflows/ci.yml b/src/doc/rustc-dev-guide/.github/workflows/ci.yml index 006bcce44b3..3f810e2fbcc 100644 --- a/src/doc/rustc-dev-guide/.github/workflows/ci.yml +++ b/src/doc/rustc-dev-guide/.github/workflows/ci.yml @@ -41,7 +41,9 @@ jobs: uses: actions/cache/restore@v4 with: path: book/linkcheck/cache.json - key: linkcheck--${{ env.MDBOOK_LINKCHECK2_VERSION }} + key: linkcheck--${{ env.MDBOOK_LINKCHECK2_VERSION }}--${{ github.run_id }} + restore-keys: | + linkcheck--${{ env.MDBOOK_LINKCHECK2_VERSION }}-- - name: Install latest nightly Rust toolchain if: steps.mdbook-cache.outputs.cache-hit != 'true' @@ -66,7 +68,7 @@ jobs: uses: actions/cache/save@v4 with: path: book/linkcheck/cache.json - key: linkcheck--${{ env.MDBOOK_LINKCHECK2_VERSION }} + key: linkcheck--${{ env.MDBOOK_LINKCHECK2_VERSION }}--${{ github.run_id }} - name: Deploy to gh-pages if: github.event_name == 'push' diff --git a/src/doc/rustc-dev-guide/.github/workflows/rustc-pull.yml b/src/doc/rustc-dev-guide/.github/workflows/rustc-pull.yml index 87a3ee2e78f..615927d55e5 100644 --- a/src/doc/rustc-dev-guide/.github/workflows/rustc-pull.yml +++ b/src/doc/rustc-dev-guide/.github/workflows/rustc-pull.yml @@ -50,10 +50,10 @@ jobs: RESULT=`gh pr list --author github-actions[bot] --state open -q 'map(select(.title=="Rustc pull update")) | length' --json title` if [[ "$RESULT" -eq 0 ]]; then echo "Creating new pull request" - PR_URL=gh pr create -B master --title 'Rustc pull update' --body 'Latest update from rustc.' + PR_URL=`gh pr create -B master --title 'Rustc pull update' --body 'Latest update from rustc.'` echo "pr_url=$PR_URL" >> $GITHUB_OUTPUT else - PR_URL=gh pr list --author github-actions[bot] --state open -q 'map(select(.title=="Rustc pull update")) | .[0].url' --json url,title + PR_URL=`gh pr list --author github-actions[bot] --state open -q 'map(select(.title=="Rustc pull update")) | .[0].url' --json url,title` echo "pr_url=$PR_URL" >> $GITHUB_OUTPUT fi env: |
