Skip to content

Commit c839ad7

Browse files
authored
Merge branch 'rust-lang:master' into fix-doc
2 parents 878a796 + 73c278f commit c839ad7

File tree

1,032 files changed

+11480
-8863
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,032 files changed

+11480
-8863
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
# If you want to modify CI jobs, take a look at src/ci/github-actions/jobs.yml.
4747
calculate_matrix:
4848
name: Calculate job matrix
49-
runs-on: ubuntu-latest
49+
runs-on: ubuntu-24.04
5050
outputs:
5151
jobs: ${{ steps.jobs.outputs.jobs }}
5252
run_type: ${{ steps.jobs.outputs.run_type }}
@@ -243,7 +243,7 @@ jobs:
243243
# when a workflow is successful listening to webhooks only in our current bors implementation (homu).
244244
outcome:
245245
name: bors build finished
246-
runs-on: ubuntu-latest
246+
runs-on: ubuntu-24.04
247247
needs: [ calculate_matrix, job ]
248248
# !cancelled() executes the job regardless of whether the previous jobs passed or failed
249249
if: ${{ !cancelled() && contains(fromJSON('["auto", "try"]'), needs.calculate_matrix.outputs.run_type) }}

.github/workflows/dependencies.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
not-waiting-on-bors:
2828
if: github.repository_owner == 'rust-lang'
2929
name: skip if S-waiting-on-bors
30-
runs-on: ubuntu-latest
30+
runs-on: ubuntu-24.04
3131
steps:
3232
- env:
3333
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -47,7 +47,7 @@ jobs:
4747
if: github.repository_owner == 'rust-lang'
4848
name: update dependencies
4949
needs: not-waiting-on-bors
50-
runs-on: ubuntu-latest
50+
runs-on: ubuntu-24.04
5151
steps:
5252
- name: checkout the source code
5353
uses: actions/checkout@v4
@@ -94,7 +94,7 @@ jobs:
9494
if: github.repository_owner == 'rust-lang'
9595
name: amend PR
9696
needs: update
97-
runs-on: ubuntu-latest
97+
runs-on: ubuntu-24.04
9898
permissions:
9999
contents: write
100100
pull-requests: write

0 commit comments

Comments
 (0)