Skip to content

Commit 2da0c86

Browse files
ickshonpeickshonpe
committed
Merge branch 'ui-batching-fix-2' into ui-batching-fix
2 parents 4196697 + 0f9f483 commit 2da0c86

File tree

680 files changed

+37612
-16295
lines changed

Some content is hidden

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

680 files changed

+37612
-16295
lines changed

‎.github/example-run/minimising.ron

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.github/example-run/resizing.ron

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.github/workflows/ci.yml

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ${{ matrix.os }}
2020
timeout-minutes: 30
2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323
- uses: actions/cache@v3
2424
with:
2525
path: |
@@ -44,7 +44,7 @@ jobs:
4444
runs-on: ubuntu-latest
4545
timeout-minutes: 30
4646
steps:
47-
- uses: actions/checkout@v3
47+
- uses: actions/checkout@v4
4848
- uses: actions/cache@v3
4949
with:
5050
path: |
@@ -67,7 +67,7 @@ jobs:
6767
runs-on: ubuntu-latest
6868
timeout-minutes: 60
6969
steps:
70-
- uses: actions/checkout@v3
70+
- uses: actions/checkout@v4
7171
- uses: actions/cache@v3
7272
with:
7373
path: |
@@ -101,7 +101,7 @@ jobs:
101101
timeout-minutes: 30
102102
needs: ci
103103
steps:
104-
- uses: actions/checkout@v3
104+
- uses: actions/checkout@v4
105105
- uses: actions/cache@v3
106106
with:
107107
path: |
@@ -127,7 +127,7 @@ jobs:
127127
timeout-minutes: 30
128128
needs: build
129129
steps:
130-
- uses: actions/checkout@v3
130+
- uses: actions/checkout@v4
131131
- uses: actions/cache@v3
132132
with:
133133
path: |
@@ -151,7 +151,7 @@ jobs:
151151
needs: check-missing-features-in-docs
152152
if: always()
153153
steps:
154-
- uses: actions/checkout@v3
154+
- uses: actions/checkout@v4
155155
with:
156156
# Full git history is needed to get a proper list of changed files within `super-linter`
157157
fetch-depth: 0
@@ -167,7 +167,7 @@ jobs:
167167
runs-on: windows-latest
168168
timeout-minutes: 60
169169
steps:
170-
- uses: actions/checkout@v3
170+
- uses: actions/checkout@v4
171171

172172
- uses: dtolnay/rust-toolchain@stable
173173

@@ -201,7 +201,7 @@ jobs:
201201
runs-on: ubuntu-latest
202202
timeout-minutes: 30
203203
steps:
204-
- uses: actions/checkout@v3
204+
- uses: actions/checkout@v4
205205
- uses: actions/cache@v3
206206
with:
207207
path: |
@@ -233,7 +233,7 @@ jobs:
233233
runs-on: ubuntu-latest
234234
timeout-minutes: 30
235235
steps:
236-
- uses: actions/checkout@v3
236+
- uses: actions/checkout@v4
237237
- name: check for missing metadata
238238
id: missing-metadata
239239
run: cargo run -p build-templated-pages -- check-missing examples
@@ -267,7 +267,7 @@ jobs:
267267
timeout-minutes: 30
268268
needs: check-missing-examples-in-docs
269269
steps:
270-
- uses: actions/checkout@v3
270+
- uses: actions/checkout@v4
271271
- name: check for missing features
272272
id: missing-features
273273
run: cargo run -p build-templated-pages -- check-missing features
@@ -301,7 +301,7 @@ jobs:
301301
timeout-minutes: 30
302302
needs: build
303303
steps:
304-
- uses: actions/checkout@v3
304+
- uses: actions/checkout@v4
305305
- uses: actions/cache@v3
306306
with:
307307
path: |
@@ -333,3 +333,25 @@ jobs:
333333
with:
334334
name: msrv
335335
path: msrv/
336+
337+
check-bevy-internal-imports:
338+
runs-on: ubuntu-latest
339+
timeout-minutes: 30
340+
steps:
341+
- uses: actions/checkout@v4
342+
- name: Check for bevy_internal imports
343+
shell: bash
344+
run: |
345+
errors=""
346+
for file in $(find examples tests -name '*.rs'); do
347+
if grep -q "use bevy_internal" "$file"; then
348+
errors+="ERROR: Detected 'use bevy_internal' in $file\n"
349+
fi
350+
done
351+
if [ -n "$errors" ]; then
352+
echo -e "$errors"
353+
echo " Avoid importing bevy_internal, it should not be used directly"
354+
echo " Fix the issue by replacing 'bevy_internal' with 'bevy'"
355+
echo " Example: 'use bevy::sprite::MaterialMesh2dBundle;' instead of 'bevy_internal::sprite::MaterialMesh2dBundle;'"
356+
exit 1
357+
fi

‎.github/workflows/daily.yml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ env:
1111

1212
jobs:
1313
build-for-iOS:
14+
if: github.repository == 'bevyengine/bevy'
1415
runs-on: macos-latest
1516
timeout-minutes: 30
1617
steps:
17-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1819

1920
- uses: dtolnay/rust-toolchain@stable
2021

@@ -38,10 +39,11 @@ jobs:
3839
-F "custom_id=$GITHUB_RUN_ID"
3940
4041
build-for-Android:
42+
if: github.repository == 'bevyengine/bevy'
4143
runs-on: ubuntu-latest
4244
timeout-minutes: 30
4345
steps:
44-
- uses: actions/checkout@v3
46+
- uses: actions/checkout@v4
4547

4648
- uses: dtolnay/rust-toolchain@stable
4749

@@ -65,6 +67,7 @@ jobs:
6567
-F "custom_id=$GITHUB_RUN_ID"
6668
6769
nonce:
70+
if: github.repository == 'bevyengine/bevy'
6871
runs-on: ubuntu-latest
6972
timeout-minutes: 30
7073
outputs:
@@ -74,6 +77,7 @@ jobs:
7477
run: echo "result=${{ github.run_id }}-$(date +%s)" >> $GITHUB_OUTPUT
7578

7679
run:
80+
if: github.repository == 'bevyengine/bevy'
7781
runs-on: ubuntu-latest
7882
timeout-minutes: 30
7983
needs: [nonce, build-for-iOS, build-for-Android]
@@ -85,10 +89,20 @@ jobs:
8589
include:
8690
- device: "iPhone 13"
8791
os_version: "15"
92+
- device: "iPhone 14"
93+
os_version: "16"
94+
- device: "iPhone 15"
95+
os_version: "17"
96+
- device: "Xiaomi Redmi Note 11"
97+
os_version: "11.0"
98+
- device: "Google Pixel 6"
99+
os_version: "12.0"
88100
- device: "Samsung Galaxy S23"
89101
os_version: "13.0"
102+
- device: "Google Pixel 8"
103+
os_version: "14.0"
90104
steps:
91-
- uses: actions/checkout@v3
105+
- uses: actions/checkout@v4
92106

93107
- name: Run Example
94108
run: |
@@ -112,6 +126,7 @@ jobs:
112126
path: .github/start-mobile-example/*.png
113127

114128
check-result:
129+
if: github.repository == 'bevyengine/bevy'
115130
runs-on: ubuntu-latest
116131
timeout-minutes: 30
117132
needs: [run]

‎.github/workflows/dependencies.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
check-advisories:
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323
- uses: dtolnay/rust-toolchain@stable
2424
- name: Install cargo-deny
2525
run: cargo install cargo-deny
@@ -46,7 +46,7 @@ jobs:
4646
with:
4747
path: cargo-tree-from-main
4848
key: cargo-tree-from-main
49-
- uses: actions/checkout@v3
49+
- uses: actions/checkout@v4
5050
- uses: dtolnay/rust-toolchain@stable
5151
# if not on main, check that the cargo tree output is unchanged
5252
- name: Check if the cargo tree changed from main
@@ -64,7 +64,7 @@ jobs:
6464
check-licenses:
6565
runs-on: ubuntu-latest
6666
steps:
67-
- uses: actions/checkout@v3
67+
- uses: actions/checkout@v4
6868
- uses: dtolnay/rust-toolchain@stable
6969
- name: Install cargo-deny
7070
run: cargo install cargo-deny
@@ -74,7 +74,7 @@ jobs:
7474
check-sources:
7575
runs-on: ubuntu-latest
7676
steps:
77-
- uses: actions/checkout@v3
77+
- uses: actions/checkout@v4
7878
- uses: dtolnay/rust-toolchain@stable
7979
- name: Install cargo-deny
8080
run: cargo install cargo-deny

‎.github/workflows/docs.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818

1919
- name: Install Rust
2020
uses: dtolnay/rust-toolchain@stable
@@ -46,6 +46,7 @@ jobs:
4646
touch target/doc/.nojekyll
4747
4848
- name: Deploy
49+
if: github.repository == 'bevyengine/bevy'
4950
uses: JamesIves/github-pages-deploy-action@v4
5051
with:
5152
branch: gh-pages

‎.github/workflows/post-release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ env:
99

1010
jobs:
1111
ci:
12+
if: github.repository == 'bevyengine/bevy'
1213
runs-on: ubuntu-latest
1314
steps:
14-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v4
1516

1617
- name: Install cargo-release
1718
run: cargo install cargo-release

‎.github/workflows/release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ env:
99

1010
jobs:
1111
ci:
12+
if: github.repository == 'bevyengine/bevy'
1213
runs-on: ubuntu-latest
1314
steps:
14-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v4
1516

1617
- name: Install cargo-release
1718
run: cargo install cargo-release

‎.github/workflows/validation-jobs.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: macos-latest
1818
timeout-minutes: 30
1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121

2222
- uses: dtolnay/rust-toolchain@stable
2323

@@ -38,7 +38,7 @@ jobs:
3838
runs-on: ubuntu-latest
3939
timeout-minutes: 30
4040
steps:
41-
- uses: actions/checkout@v3
41+
- uses: actions/checkout@v4
4242

4343
- uses: dtolnay/rust-toolchain@stable
4444

@@ -74,10 +74,10 @@ jobs:
7474
- name: install xvfb, llvmpipe and lavapipe
7575
run: |
7676
sudo apt-get update -y -qq
77-
sudo add-apt-repository ppa:oibaf/graphics-drivers -y
77+
sudo add-apt-repository ppa:kisak/kisak-mesa -y
7878
sudo apt-get update
7979
sudo apt install -y xvfb libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers
80-
- uses: actions/checkout@v3
80+
- uses: actions/checkout@v4
8181
- uses: actions/cache@v3
8282
with:
8383
path: |
@@ -128,7 +128,7 @@ jobs:
128128
runs-on: ubuntu-latest
129129
timeout-minutes: 60
130130
steps:
131-
- uses: actions/checkout@v3
131+
- uses: actions/checkout@v4
132132

133133
- uses: dtolnay/rust-toolchain@stable
134134
with:
@@ -148,7 +148,7 @@ jobs:
148148
- name: install xvfb, llvmpipe and lavapipe
149149
run: |
150150
sudo apt-get update -y -qq
151-
sudo add-apt-repository ppa:oibaf/graphics-drivers -y
151+
sudo add-apt-repository ppa:kisak/kisak-mesa -y
152152
sudo apt-get update
153153
sudo apt install -y xvfb libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers
154154
@@ -189,7 +189,7 @@ jobs:
189189
crate: [bevy_ecs, bevy_reflect, bevy]
190190
runs-on: ubuntu-latest
191191
steps:
192-
- uses: actions/checkout@v3
192+
- uses: actions/checkout@v4
193193
- uses: dtolnay/rust-toolchain@stable
194194
- name: Install alsa and udev
195195
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
@@ -218,7 +218,7 @@ jobs:
218218
runs-on: ubuntu-latest
219219
timeout-minutes: 30
220220
steps:
221-
- uses: actions/checkout@v3
221+
- uses: actions/checkout@v4
222222
- uses: actions/cache@v3
223223
with:
224224
path: |

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,7 @@ dxil.dll
1212

1313
# Generated by "examples/scene/scene.rs"
1414
assets/scenes/load_scene_example-new.scn.ron
15+
16+
assets/**/*.meta
17+
crates/bevy_asset/imported_assets
18+
imported_assets

0 commit comments

Comments
 (0)