Skip to content

Commit f679bac

Browse files
committed
Merge remote-tracking branch 'upstream/main' into split-bundle
2 parents c9fc0e4 + dc148a7 commit f679bac

File tree

859 files changed

+18572
-14136
lines changed

Some content is hidden

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

859 files changed

+18572
-14136
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ labels: C-Bug, S-Needs-Triage
66
assignees: ''
77
---
88

9-
## Bevy version
9+
## Bevy version and features
1010

11-
The release number or commit hash of the version you're using.
11+
- The release number or commit hash of the version you're using.
12+
- If you're not using default features, the combination of bevy's cargo features you are using.
1213

1314
## \[Optional\] Relevant system information
1415

.github/actions/install-linux-deps/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ inputs:
2828
wayland:
2929
description: Install Wayland (libwayland-dev)
3030
required: false
31-
default: "false"
31+
default: "true"
3232
xkb:
3333
description: Install xkb (libxkbcommon-dev)
3434
required: false

.github/workflows/action-on-PR-labeled.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
if: github.event.label.name == 'M-Needs-Migration-Guide'
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020
with:
2121
ref: ${{ github.event.pull_request.head.sha }}
2222
fetch-depth: 2
@@ -46,7 +46,7 @@ jobs:
4646
runs-on: ubuntu-latest
4747
if: github.event.label.name == 'M-Needs-Release-Note'
4848
steps:
49-
- uses: actions/checkout@v4
49+
- uses: actions/checkout@v5
5050
with:
5151
ref: ${{ github.event.pull_request.head.sha }}
5252
fetch-depth: 2
@@ -70,5 +70,5 @@ jobs:
7070
repo: context.repo.repo,
7171
body: `It looks like your PR has been selected for a highlight in the next release blog post, but **you didn't provide a release note**.
7272
73-
Please review the [instructions for writing release notes](https://github.com/bevyengine/bevy/tree/main/release-content/release_notes.md), then expand or revise the content in the [release notes directory](https://github.com/bevyengine/bevy/tree/main/release-content/release_notes) to showcase your changes.`
73+
Please review the [instructions for writing release notes](https://github.com/bevyengine/bevy/tree/main/release-content/release_notes.md), then expand or revise the content in the [release notes directory](https://github.com/bevyengine/bevy/tree/main/release-content/release-notes) to showcase your changes.`
7474
})

.github/workflows/ci.yml

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: CI
22

3+
permissions:
4+
contents: read
5+
36
on:
47
merge_group:
58
pull_request:
@@ -30,7 +33,7 @@ jobs:
3033
runs-on: ${{ matrix.os }}
3134
timeout-minutes: 30
3235
steps:
33-
- uses: actions/checkout@v4
36+
- uses: actions/checkout@v5
3437
- uses: actions/cache/restore@v4
3538
with:
3639
# key won't match, will rely on restore-keys
@@ -58,7 +61,7 @@ jobs:
5861
runs-on: ubuntu-latest
5962
timeout-minutes: 30
6063
steps:
61-
- uses: actions/checkout@v4
64+
- uses: actions/checkout@v5
6265
- uses: actions/cache/restore@v4
6366
with:
6467
# key won't match, will rely on restore-keys
@@ -89,7 +92,7 @@ jobs:
8992
runs-on: macos-latest
9093
timeout-minutes: 60
9194
steps:
92-
- uses: actions/checkout@v4
95+
- uses: actions/checkout@v5
9396
- uses: actions/cache/restore@v4
9497
with:
9598
# key won't match, will rely on restore-keys
@@ -125,7 +128,7 @@ jobs:
125128
timeout-minutes: 30
126129
needs: ci
127130
steps:
128-
- uses: actions/checkout@v4
131+
- uses: actions/checkout@v5
129132
- uses: actions/cache/restore@v4
130133
with:
131134
# key won't match, will rely on restore-keys
@@ -154,7 +157,7 @@ jobs:
154157
timeout-minutes: 30
155158
needs: ci
156159
steps:
157-
- uses: actions/checkout@v4
160+
- uses: actions/checkout@v5
158161
- uses: actions/cache/restore@v4
159162
with:
160163
# key won't match, will rely on restore-keys
@@ -182,7 +185,7 @@ jobs:
182185
timeout-minutes: 30
183186
needs: ci
184187
steps:
185-
- uses: actions/checkout@v4
188+
- uses: actions/checkout@v5
186189
- uses: actions/cache/restore@v4
187190
with:
188191
# key won't match, will rely on restore-keys
@@ -210,7 +213,7 @@ jobs:
210213
timeout-minutes: 30
211214
needs: ci
212215
steps:
213-
- uses: actions/checkout@v4
216+
- uses: actions/checkout@v5
214217
- uses: actions/cache/restore@v4
215218
with:
216219
# key won't match, will rely on restore-keys
@@ -238,7 +241,7 @@ jobs:
238241
timeout-minutes: 30
239242
needs: build
240243
steps:
241-
- uses: actions/checkout@v4
244+
- uses: actions/checkout@v5
242245
- uses: actions/cache/restore@v4
243246
with:
244247
# key won't match, will rely on restore-keys
@@ -257,14 +260,17 @@ jobs:
257260
with:
258261
target: wasm32-unknown-unknown
259262
- name: Check wasm
263+
env:
264+
RUSTFLAGS: --cfg getrandom_backend="wasm_js"
260265
run: cargo check --target wasm32-unknown-unknown
261266

262267
build-wasm-atomics:
268+
if: ${{ false }} # Disabled temporarily due to https://github.com/rust-lang/rust/issues/145101
263269
runs-on: ubuntu-latest
264270
timeout-minutes: 30
265271
needs: build
266272
steps:
267-
- uses: actions/checkout@v4
273+
- uses: actions/checkout@v5
268274
- uses: actions/cache/restore@v4
269275
with:
270276
# key won't match, will rely on restore-keys
@@ -287,15 +293,15 @@ jobs:
287293
- name: Check wasm
288294
run: cargo check --target wasm32-unknown-unknown -Z build-std=std,panic_abort
289295
env:
290-
RUSTFLAGS: "-C target-feature=+atomics,+bulk-memory"
296+
RUSTFLAGS: '-C target-feature=+atomics,+bulk-memory --cfg getrandom_backend="wasm_js"'
291297

292298
markdownlint:
293299
runs-on: ubuntu-latest
294300
timeout-minutes: 30
295301
needs: check-missing-features-in-docs
296302
if: always()
297303
steps:
298-
- uses: actions/checkout@v4
304+
- uses: actions/checkout@v5
299305
with:
300306
# Full git history is needed to get a proper list of changed files within `super-linter`
301307
fetch-depth: 0
@@ -311,7 +317,7 @@ jobs:
311317
runs-on: ubuntu-latest
312318
timeout-minutes: 30
313319
steps:
314-
- uses: actions/checkout@v4
320+
- uses: actions/checkout@v5
315321
# Update in sync with BINSTALL_VERSION
316322
- uses: cargo-bins/[email protected]
317323
- name: Install taplo
@@ -332,9 +338,9 @@ jobs:
332338
runs-on: ubuntu-latest
333339
timeout-minutes: 30
334340
steps:
335-
- uses: actions/checkout@v4
341+
- uses: actions/checkout@v5
336342
- name: Check for typos
337-
uses: crate-ci/typos@v1.34.0
343+
uses: crate-ci/typos@v1.35.4
338344
- name: Typos info
339345
if: failure()
340346
run: |
@@ -348,7 +354,7 @@ jobs:
348354
runs-on: ubuntu-latest
349355
timeout-minutes: 30
350356
steps:
351-
- uses: actions/checkout@v4
357+
- uses: actions/checkout@v5
352358
- uses: actions/cache/restore@v4
353359
with:
354360
# key won't match, will rely on restore-keys
@@ -386,7 +392,7 @@ jobs:
386392
runs-on: ubuntu-latest
387393
timeout-minutes: 30
388394
steps:
389-
- uses: actions/checkout@v4
395+
- uses: actions/checkout@v5
390396
- uses: dtolnay/rust-toolchain@stable
391397
- name: check for missing metadata
392398
id: missing-metadata
@@ -421,7 +427,7 @@ jobs:
421427
timeout-minutes: 30
422428
needs: check-missing-examples-in-docs
423429
steps:
424-
- uses: actions/checkout@v4
430+
- uses: actions/checkout@v5
425431
- uses: dtolnay/rust-toolchain@stable
426432
- name: check for missing features
427433
id: missing-features
@@ -456,7 +462,7 @@ jobs:
456462
timeout-minutes: 30
457463
needs: build
458464
steps:
459-
- uses: actions/checkout@v4
465+
- uses: actions/checkout@v5
460466
- uses: dtolnay/rust-toolchain@stable
461467
- name: get MSRV
462468
id: msrv
@@ -500,7 +506,7 @@ jobs:
500506
runs-on: ubuntu-latest
501507
timeout-minutes: 30
502508
steps:
503-
- uses: actions/checkout@v4
509+
- uses: actions/checkout@v5
504510
- name: Check for internal Bevy imports
505511
shell: bash
506512
run: |

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
build-mode: none
4040
steps:
4141
- name: Checkout repository
42-
uses: actions/checkout@v4
42+
uses: actions/checkout@v5
4343

4444
# Initializes the CodeQL tools for scanning.
4545
- name: Initialize CodeQL

.github/workflows/dependencies.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
name: Dependencies
22

3+
permissions:
4+
contents: read
5+
36
on:
47
pull_request:
58
paths:
6-
- '**/Cargo.toml'
7-
- 'deny.toml'
9+
- "**/Cargo.toml"
10+
- "deny.toml"
811
push:
912
paths:
10-
- '**/Cargo.toml'
11-
- 'deny.toml'
13+
- "**/Cargo.toml"
14+
- "deny.toml"
1215
branches:
1316
- main
1417

@@ -23,7 +26,7 @@ jobs:
2326
check-advisories:
2427
runs-on: ubuntu-latest
2528
steps:
26-
- uses: actions/checkout@v4
29+
- uses: actions/checkout@v5
2730
- uses: dtolnay/rust-toolchain@stable
2831
- name: Install cargo-deny
2932
run: cargo install cargo-deny
@@ -33,7 +36,7 @@ jobs:
3336
check-bans:
3437
runs-on: ubuntu-latest
3538
steps:
36-
- uses: actions/checkout@v4
39+
- uses: actions/checkout@v5
3740
- uses: dtolnay/rust-toolchain@stable
3841
- name: Install cargo-deny
3942
run: cargo install cargo-deny
@@ -43,7 +46,7 @@ jobs:
4346
check-licenses:
4447
runs-on: ubuntu-latest
4548
steps:
46-
- uses: actions/checkout@v4
49+
- uses: actions/checkout@v5
4750
- uses: dtolnay/rust-toolchain@stable
4851
- name: Install cargo-deny
4952
run: cargo install cargo-deny
@@ -53,7 +56,7 @@ jobs:
5356
check-sources:
5457
runs-on: ubuntu-latest
5558
steps:
56-
- uses: actions/checkout@v4
59+
- uses: actions/checkout@v5
5760
- uses: dtolnay/rust-toolchain@stable
5861
- name: Install cargo-deny
5962
run: cargo install cargo-deny

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
url: ${{ steps.deployment.outputs.page_url }}
3636
steps:
3737
- name: Checkout
38-
uses: actions/checkout@v4
38+
uses: actions/checkout@v5
3939

4040
- uses: dtolnay/rust-toolchain@master
4141
with:

.github/workflows/example-run-report.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ name: Example Run - PR Comments
66
# Also requesting write permissions on PR to be able to comment
77
permissions:
88
pull-requests: "write"
9+
contents: "read"
910

1011
on:
1112
workflow_run:
@@ -59,8 +60,10 @@ jobs:
5960
path: screenshots
6061
- name: branch name
6162
id: branch-name
63+
env:
64+
BRANCH_NAME: ${{ github.event.workflow_run.head_branch }}
6265
run: |
63-
echo "result=PR-$(cat PR)-${{ github.event.workflow_run.head_branch }}" >> $GITHUB_OUTPUT
66+
echo "result=PR-$(cat PR)-$BRANCH_NAME" >> $GITHUB_OUTPUT
6467
- name: PR number
6568
id: pr-number
6669
run: |
@@ -83,7 +86,7 @@ jobs:
8386
needs: [make-macos-screenshots-available, compare-macos-screenshots]
8487
if: ${{ always() && needs.compare-macos-screenshots.result == 'failure' }}
8588
steps:
86-
- uses: actions/checkout@v4
89+
- uses: actions/checkout@v5
8790
- name: "Check if PR already has label"
8891
id: check-label
8992
env:

.github/workflows/example-run.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Example Run
22

3+
permissions:
4+
contents: read
5+
36
on:
47
merge_group:
58
pull_request:
@@ -17,10 +20,10 @@ env:
1720

1821
jobs:
1922
run-examples-macos-metal:
20-
runs-on: macos-latest
23+
runs-on: macos-14
2124
timeout-minutes: 30
2225
steps:
23-
- uses: actions/checkout@v4
26+
- uses: actions/checkout@v5
2427
- uses: dtolnay/rust-toolchain@stable
2528
- name: Disable audio
2629
# Disable audio through a patch. on github m1 runners, audio timeouts after 15 minutes
@@ -91,7 +94,7 @@ jobs:
9194
runs-on: ubuntu-latest
9295
timeout-minutes: 30
9396
steps:
94-
- uses: actions/checkout@v4
97+
- uses: actions/checkout@v5
9598
- name: Install Linux dependencies
9699
uses: ./.github/actions/install-linux-deps
97100
# At some point this may be merged into `install-linux-deps`, but for now it is its own step.
@@ -161,7 +164,7 @@ jobs:
161164
runs-on: windows-latest
162165
timeout-minutes: 30
163166
steps:
164-
- uses: actions/checkout@v4
167+
- uses: actions/checkout@v5
165168
- uses: dtolnay/rust-toolchain@stable
166169
- uses: actions/cache/restore@v4
167170
with:

.github/workflows/post-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
contents: write
1616
pull-requests: write
1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v5
1919

2020
- name: Install cargo-release
2121
run: cargo install cargo-release

0 commit comments

Comments
 (0)