Skip to content

Commit 0a3fed2

Browse files
cartcart
authored
Merge branch 'main' into traffic_lights
2 parents 6f51390 + 3567812 commit 0a3fed2

557 files changed

Lines changed: 22980 additions & 9766 deletions

File tree

Some content is hidden

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
env:
3333
BASE_SHA: ${{ github.event.pull_request.base.sha }}
3434
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
35-
- uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
35+
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
3636
if: steps.get_changes.outputs.found_changes == '0'
3737
with:
3838
script: |
@@ -65,7 +65,7 @@ jobs:
6565
env:
6666
BASE_SHA: ${{ github.event.pull_request.base.sha }}
6767
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
68-
- uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
68+
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
6969
if: steps.get_changes.outputs.found_changes == '0'
7070
with:
7171
script: |

‎.github/workflows/ci-comment-failures.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
steps:
2121
- name: "Download artifact"
2222
id: find-artifact
23-
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
23+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
2424
with:
2525
result-encoding: string
2626
script: |
@@ -60,7 +60,7 @@ jobs:
6060
fi
6161
- name: "Comment on PR"
6262
if: ${{ steps.find-artifact.outputs.result == 'true' && steps.check-last-comment.outputs.result == 'false' }}
63-
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
63+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
6464
with:
6565
github-token: ${{ secrets.GITHUB_TOKEN }}
6666
script: |
@@ -93,7 +93,7 @@ jobs:
9393
steps:
9494
- name: "Download artifact"
9595
id: find-artifact
96-
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
96+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
9797
with:
9898
result-encoding: string
9999
script: |
@@ -133,7 +133,7 @@ jobs:
133133
fi
134134
- name: "Comment on PR"
135135
if: ${{ steps.find-artifact.outputs.result == 'true' && steps.check-last-comment.outputs.result == 'false' }}
136-
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
136+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
137137
with:
138138
github-token: ${{ secrets.GITHUB_TOKEN }}
139139
script: |
@@ -166,7 +166,7 @@ jobs:
166166
steps:
167167
- name: "Download artifact"
168168
id: find-artifact
169-
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
169+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
170170
with:
171171
result-encoding: string
172172
script: |
@@ -206,7 +206,7 @@ jobs:
206206
fi
207207
- name: "Comment on PR"
208208
if: ${{ steps.find-artifact.outputs.result == 'true' && steps.check-last-comment.outputs.result == 'false' }}
209-
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
209+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
210210
with:
211211
github-token: ${{ secrets.GITHUB_TOKEN }}
212212
script: |

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ jobs:
374374
with:
375375
persist-credentials: false
376376
- name: Check for typos
377-
uses: crate-ci/typos@02ea592e44b3a53c302f697cddca7641cd051c3d # v1.45.0
377+
uses: crate-ci/typos@cf5f1c29a8ac336af8568821ec41919923b05a83 # v1.45.1
378378
- name: Typos info
379379
if: failure()
380380
run: |
@@ -460,7 +460,7 @@ jobs:
460460
- name: log failed task - missing update
461461
if: ${{ failure() && github.event_name == 'pull_request' && steps.missing-update.conclusion == 'failure' }}
462462
run: touch ./missing-examples/missing-update
463-
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
463+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
464464
if: ${{ failure() && github.event_name == 'pull_request' }}
465465
with:
466466
name: missing-examples
@@ -499,7 +499,7 @@ jobs:
499499
- name: log failed task - missing update
500500
if: ${{ failure() && github.event_name == 'pull_request' && steps.missing-update.conclusion == 'failure' }}
501501
run: touch ./missing-features/missing-update
502-
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
502+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
503503
if: ${{ failure() && github.event_name == 'pull_request' }}
504504
with:
505505
name: missing-features
@@ -548,7 +548,7 @@ jobs:
548548
run: |
549549
mkdir -p ./msrv
550550
echo ${{ github.event.number }} > ./msrv/NR
551-
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
551+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
552552
if: ${{ failure() && github.event_name == 'pull_request' && steps.check.conclusion == 'failure' }}
553553
with:
554554
name: msrv

‎.github/workflows/docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
rm target/doc/.lock
9292
9393
- name: Upload site artifact
94-
uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4.0.0
94+
uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 # v5.0.0
9595
with:
9696
path: target/doc
9797

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
steps:
2525
- name: "Download artifact"
2626
id: find-artifact
27-
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
27+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
2828
with:
2929
result-encoding: string
3030
script: |
@@ -53,7 +53,7 @@ jobs:
5353
mkdir screenshots
5454
mv screenshots-* screenshots/
5555
- name: save screenshots
56-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
56+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
5757
with:
5858
name: screenshots-macos
5959
path: screenshots

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

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
example_name=`basename $example .ron`
5353
echo -n $example_name > last_example_run
5454
echo "running $example_name - "`date`
55-
time TRACE_CHROME=trace-$example_name.json CI_TESTING_CONFIG=$example cargo run --example $example_name --features "bevy_ci_testing,trace,trace_chrome,bevy_ui_debug"
55+
time TRACE_CHROME=trace-$example_name.json CI_TESTING_CONFIG=$example cargo run --example $example_name --features "bevy_ci_testing,trace,trace_chrome,bevy_ui_debug,area_light_luts"
5656
sleep 10
5757
if [ `find ./ -maxdepth 1 -name 'screenshot-*.png' -print -quit` ]; then
5858
mkdir screenshots-$example_name
@@ -62,7 +62,7 @@ jobs:
6262
mkdir traces && mv trace*.json traces/
6363
mkdir screenshots && mv screenshots-* screenshots/
6464
- name: save traces
65-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
65+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
6666
with:
6767
name: example-traces-macos
6868
path: traces
@@ -71,11 +71,11 @@ jobs:
7171
run: |
7272
echo ${{ github.event.number }} > ./screenshots/PR
7373
- name: save screenshots
74-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
74+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
7575
with:
7676
name: screenshots-macos
7777
path: screenshots
78-
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
78+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
7979
if: ${{ failure() && github.event_name == 'pull_request' }}
8080
with:
8181
name: example-run-macos
@@ -132,7 +132,7 @@ jobs:
132132
example_name=`basename $example .ron`
133133
echo -n $example_name > last_example_run
134134
echo "running $example_name - "`date`
135-
time TRACE_CHROME=trace-$example_name.json CI_TESTING_CONFIG=$example xvfb-run cargo run --example $example_name --features "bevy_ci_testing,trace,trace_chrome,bevy_ui_debug"
135+
time TRACE_CHROME=trace-$example_name.json CI_TESTING_CONFIG=$example xvfb-run cargo run --example $example_name --features "bevy_ci_testing,trace,trace_chrome,bevy_ui_debug,area_light_luts"
136136
sleep 10
137137
if [ `find ./ -maxdepth 1 -name 'screenshot-*.png' -print -quit` ]; then
138138
mkdir screenshots-$example_name
@@ -142,16 +142,16 @@ jobs:
142142
mkdir traces && mv trace*.json traces/
143143
mkdir screenshots && mv screenshots-* screenshots/
144144
- name: save traces
145-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
145+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
146146
with:
147147
name: example-traces-linux
148148
path: traces
149149
- name: save screenshots
150-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
150+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
151151
with:
152152
name: screenshots-linux
153153
path: screenshots
154-
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
154+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
155155
if: ${{ failure() && github.event_name == 'pull_request' }}
156156
with:
157157
name: example-run-linux
@@ -172,7 +172,8 @@ jobs:
172172
run-examples-on-windows-dx12:
173173
if: ${{ github.event_name != 'pull_request' }}
174174
runs-on: windows-latest
175-
timeout-minutes: 30
175+
# See https://github.com/bevyengine/bevy/issues/24106 for discussions on speeding this up
176+
timeout-minutes: 60
176177
steps:
177178
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
178179
with:
@@ -201,7 +202,7 @@ jobs:
201202
example_name=`basename $example .ron`
202203
echo -n $example_name > last_example_run
203204
echo "running $example_name - "`date`
204-
time WGPU_BACKEND=dx12 TRACE_CHROME=trace-$example_name.json CI_TESTING_CONFIG=$example cargo run --example $example_name --features "statically-linked-dxc,bevy_ci_testing,trace,trace_chrome,bevy_ui_debug"
205+
time WGPU_BACKEND=dx12 TRACE_CHROME=trace-$example_name.json CI_TESTING_CONFIG=$example cargo run --example $example_name --features "statically-linked-dxc,bevy_ci_testing,trace,trace_chrome,bevy_ui_debug,area_light_luts"
205206
sleep 10
206207
if [ `find ./ -maxdepth 1 -name 'screenshot-*.png' -print -quit` ]; then
207208
mkdir screenshots-$example_name
@@ -211,16 +212,16 @@ jobs:
211212
mkdir traces && mv trace*.json traces/
212213
mkdir screenshots && mv screenshots-* screenshots/
213214
- name: save traces
214-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
215+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
215216
with:
216217
name: example-traces-windows
217218
path: traces
218219
- name: save screenshots
219-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
220+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
220221
with:
221222
name: screenshots-windows
222223
path: screenshots
223-
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
224+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
224225
if: ${{ failure() && github.event_name == 'pull_request' }}
225226
with:
226227
name: example-run-windows

‎.github/workflows/post-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
--exclude bistro
6161
6262
- name: Create PR
63-
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
63+
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
6464
with:
6565
delete-branch: true
6666
base: "main"

‎.github/workflows/security-static-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,4 @@ jobs:
8787
persist-credentials: false
8888

8989
- name: Run zizmor 🌈
90-
uses: zizmorcore/zizmor-action@71321a20a9ded102f6e9ce5718a2fcec2c4f70d8 # v0.5.2
90+
uses: zizmorcore/zizmor-action@b1d7e1fb5de872772f31590499237e7cce841e8e # v0.5.3

‎.github/workflows/validation-jobs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ jobs:
158158
xvfb-run cargo run -p build-wasm-example -- --browsers chromium --browsers firefox --frames 25 --test 2d_shapes lighting text_debug breakout
159159
160160
- name: Save screenshots
161-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
161+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
162162
with:
163163
name: screenshots-wasm
164164
path: .github/start-wasm-example/screenshot-*.png

‎.github/workflows/welcome.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
permissions:
1717
pull-requests: write
1818
steps:
19-
- uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
19+
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
2020
with:
2121
script: |
2222
// Get a list of all issues created by the PR opener

0 commit comments

Comments
 (0)