-
-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feature/android-directory-assets
- Loading branch information
Showing
743 changed files
with
28,596 additions
and
12,686 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -92,16 +92,15 @@ jobs: | |
components: miri | ||
- name: CI job | ||
# To run the tests one item at a time for troubleshooting, use | ||
# cargo --quiet test --lib -- --list | sed 's/: test$//' | MIRIFLAGS="-Zmiri-disable-isolation -Zmiri-permissive-provenance -Zmiri-disable-weak-memory-emulation" xargs -n1 cargo miri test -p bevy_ecs --lib -- --exact | ||
# cargo --quiet test --lib -- --list | sed 's/: test$//' | MIRIFLAGS="-Zmiri-disable-isolation -Zmiri-disable-weak-memory-emulation" xargs -n1 cargo miri test -p bevy_ecs --lib -- --exact | ||
run: cargo miri test -p bevy_ecs | ||
env: | ||
# -Zrandomize-layout makes sure we dont rely on the layout of anything that might change | ||
RUSTFLAGS: -Zrandomize-layout | ||
# https://github.com/rust-lang/miri#miri--z-flags-and-environment-variables | ||
# -Zmiri-disable-isolation is needed because our executor uses `fastrand` which accesses system time. | ||
# -Zmiri-permissive-provenance disables warnings against int2ptr casts (since those are used by once_cell) | ||
# -Zmiri-ignore-leaks is necessary because a bunch of tests don't join all threads before finishing. | ||
MIRIFLAGS: -Zmiri-ignore-leaks -Zmiri-disable-isolation -Zmiri-permissive-provenance | ||
MIRIFLAGS: -Zmiri-ignore-leaks -Zmiri-disable-isolation | ||
|
||
check-compiles: | ||
runs-on: ubuntu-latest | ||
|
@@ -219,7 +218,7 @@ jobs: | |
steps: | ||
- uses: actions/checkout@v4 | ||
- name: Check for typos | ||
uses: crate-ci/[email protected].1 | ||
uses: crate-ci/[email protected].6 | ||
- name: Typos info | ||
if: failure() | ||
run: | | ||
|
@@ -420,19 +419,19 @@ jobs: | |
timeout-minutes: 30 | ||
steps: | ||
- uses: actions/checkout@v4 | ||
- name: Check for bevy_internal imports | ||
- name: Check for internal Bevy imports | ||
shell: bash | ||
run: | | ||
errors="" | ||
for file in $(find examples tests -name '*.rs'); do | ||
if grep -q "use bevy_internal" "$file"; then | ||
errors+="ERROR: Detected 'use bevy_internal' in $file\n" | ||
if grep -q "use bevy_" "$file"; then | ||
errors+="ERROR: Detected internal Bevy import in $file\n" | ||
fi | ||
done | ||
if [ -n "$errors" ]; then | ||
echo -e "$errors" | ||
echo " Avoid importing bevy_internal, it should not be used directly" | ||
echo " Fix the issue by replacing 'bevy_internal' with 'bevy'" | ||
echo " Avoid importing internal Bevy crates, they should not be used directly" | ||
echo " Fix the issue by replacing 'bevy_*' with 'bevy'" | ||
echo " Example: 'use bevy::sprite::MaterialMesh2dBundle;' instead of 'bevy_internal::sprite::MaterialMesh2dBundle;'" | ||
exit 1 | ||
fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.