Skip to content

Commit 26b8bda

Browse files
committed
Merge remote-tracking branch 'upstream/main' into motion-blur
2 parents 79ec4c2 + de004da commit 26b8bda

File tree

528 files changed

+16770
-8137
lines changed

Some content is hidden

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

528 files changed

+16770
-8137
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -168,19 +168,20 @@ jobs:
168168
timeout-minutes: 30
169169
steps:
170170
- uses: actions/checkout@v4
171+
- uses: dtolnay/rust-toolchain@stable
171172
- name: Install taplo
172-
run: |
173-
curl -fsSL https://github.com/tamasfe/taplo/releases/latest/download/taplo-full-linux-x86_64.gz \
174-
| gzip -d - \
175-
| install -m 755 /dev/stdin /usr/local/bin/taplo
173+
run: cargo install taplo-cli --locked
176174
- name: Run Taplo
177175
id: taplo
178176
run: taplo fmt --check --diff
179177
- name: Taplo info
180178
if: failure()
181179
run: |
182180
echo 'To fix toml fmt, please run `taplo fmt`'
183-
echo 'Or if you use VSCode, use the Even Better Toml extension'
181+
echo 'To check for a diff, run `taplo fmt --check --diff'
182+
echo 'You can find taplo here: https://taplo.tamasfe.dev/'
183+
echo 'Or if you use VSCode, use the `Even Better Toml` extension with 2 spaces'
184+
echo 'You can find the extension here: https://marketplace.visualstudio.com/items?itemName=tamasfe.even-better-toml'
184185
185186
186187
run-examples-on-windows-dx12:

.github/workflows/post-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
--exclude build-wasm-example
5050
5151
- name: Create PR
52-
uses: peter-evans/create-pull-request@v5
52+
uses: peter-evans/create-pull-request@v6
5353
with:
5454
delete-branch: true
5555
base: "main"

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
--exclude build-wasm-example
4747
4848
- name: Create PR
49-
uses: peter-evans/create-pull-request@v5
49+
uses: peter-evans/create-pull-request@v6
5050
with:
5151
delete-branch: true
5252
base: "main"

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ dxil.dll
1313
# Generated by "examples/scene/scene.rs"
1414
assets/scenes/load_scene_example-new.scn.ron
1515

16+
# Generated by "examples/window/screenshot.rs"
17+
**/screenshot-*.png
18+
1619
assets/**/*.meta
1720
crates/bevy_asset/imported_assets
1821
imported_assets

0 commit comments

Comments
 (0)