Merge branch 'main' into 5345-env-bevy-asset-root

bevyengine · Oct 25, 2022 · 25d2d31 · 25d2d31
2 parents 6abb679 + a6f6a8f
commit 25d2d31
Show file tree

Hide file tree

Showing 533 changed files with 28,340 additions and 12,078 deletions.
diff --git a/.github/bors.toml b/.github/bors.toml
@@ -14,6 +14,9 @@ status = [
     "check-compiles",
     "build-and-install-on-iOS",
     "run-examples-on-windows-dx12",
+    "build-without-default-features (bevy)",
+    "build-without-default-features (bevy_ecs)",
+    "build-without-default-features (bevy_reflect)",
 ]
 
 use_squash_merge = true

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  NIGHTLY_TOOLCHAIN: nightly-2022-07-13
+  NIGHTLY_TOOLCHAIN: nightly
 
 jobs:
   build:
@@ -28,6 +28,10 @@ jobs:
             ~/.cargo/git/db/
             target/
           key: ${{ runner.os }}-cargo-build-stable-${{ hashFiles('**/Cargo.toml') }}
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
       - name: Install alsa and udev
         run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
         if: runner.os == 'linux'
@@ -93,9 +97,8 @@ jobs:
           # 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-disable-weak-memory-emulation works around https://github.com/bevyengine/bevy/issues/5164.
           # -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 -Zmiri-disable-weak-memory-emulation
+          MIRIFLAGS: -Zmiri-ignore-leaks -Zmiri-disable-isolation -Zmiri-permissive-provenance
 
   check-compiles:
     runs-on: ubuntu-latest
@@ -195,8 +198,9 @@ jobs:
         with:
           toolchain: stable
       - name: Build bevy
+        # this uses the same command as when running the example to ensure build is reused
         run: |
-          cargo build --features "bevy_ci_testing,trace,trace_chrome"
+          TRACE_CHROME=trace-alien_cake_addict.json CI_TESTING_CONFIG=.github/example-run/alien_cake_addict.ron cargo build --example alien_cake_addict --features "bevy_ci_testing,trace,trace_chrome"
       - name: Run examples
         run: |
           for example in .github/example-run/*.ron; do

diff --git a/.github/workflows/validation-jobs.yml b/.github/workflows/validation-jobs.yml
@@ -41,7 +41,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
-      
+
       - uses: actions/cache@v3
         with:
           path: |
@@ -51,15 +51,15 @@ jobs:
             ~/.cargo/git/db/
             target/
           key: ${{ runner.os }}-cargo-build-android-${{ hashFiles('**/Cargo.toml') }}
-      
+
       - name: Install Android targets
         run: rustup target add aarch64-linux-android armv7-linux-androideabi
-      
+
       - name: Install Cargo APK
         run: cargo install --force cargo-apk
-      
+
       - name: Build APK
-        run: cargo apk build --example android_example
+        run: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME cargo apk build --example android_example
 
   run-examples-on-windows-dx12:
     runs-on: windows-latest
@@ -82,8 +82,10 @@ jobs:
           key: ${{ runner.os }}-windows-run-examples-${{ hashFiles('**/Cargo.toml') }}
 
       - name: Build bevy
+        shell: bash
+        # this uses the same command as when running the example to ensure build is reused
         run: |
-          cargo build --features "bevy_ci_testing"
+          WGPU_BACKEND=dx12 CI_TESTING_CONFIG=.github/example-run/alien_cake_addict.ron cargo build --example alien_cake_addict --features "bevy_ci_testing"
 
       - name: Run examples
         shell: bash
@@ -145,10 +147,29 @@ jobs:
           # start a webserver
           python3 -m http.server --directory examples/wasm &
 
-          xvfb-run cargo run -p build-wasm-example -- --browsers chromium --browsers firefox --frames 25 --test shapes lighting text_debug breakout
+          xvfb-run cargo run -p build-wasm-example -- --browsers chromium --browsers firefox --frames 25 --test 2d_shapes lighting text_debug breakout
 
       - name: Save screenshots
         uses: actions/upload-artifact@v3
         with:
           name: screenshots
           path: .github/start-wasm-example/screenshot-*.png
+
+  build-without-default-features:
+    strategy:
+      matrix:
+        crate: [bevy_ecs, bevy_reflect, bevy]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+      - name: Install alsa and udev
+        run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
+      - name: Build
+        run: cargo build -p ${{ matrix.crate }} --no-default-features
+        env:
+          CARGO_INCREMENTAL: 0
+          RUSTFLAGS: "-C debuginfo=0 -D warnings"
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,6 @@ Cargo.lock
 /.idea
 /.vscode
 /benches/target
+
+# Generated by "examples/scene/scene.rs"
+assets/scenes/load_scene_example-new.scn.ron