Revert

Author: Jondolf

.cargo/config_fast_builds renamed to .cargo/config_fast_builds.toml

@@ -5,26 +5,27 @@
 
 [target.x86_64-unknown-linux-gnu]
 linker = "clang"
-rustflags = ["-Clink-arg=-fuse-ld=lld", "-Zshare-generics=y"]
+rustflags = [
+  "-Clink-arg=-fuse-ld=lld", # Use LLD Linker
+  "-Zshare-generics=y",      # (Nightly) Make the current crate share its generic instantiations
+]
 
 # NOTE: you must install [Mach-O LLD Port](https://lld.llvm.org/MachO/index.html) on mac. you can easily do this by installing llvm which includes lld with the "brew" package manager:
 # `brew install llvm`
 [target.x86_64-apple-darwin]
 rustflags = [
-    "-C",
-    "link-arg=-fuse-ld=/usr/local/opt/llvm/bin/ld64.lld",
-    "-Zshare-generics=y",
+  "-Clink-arg=-fuse-ld=/usr/local/opt/llvm/bin/ld64.lld", # Use LLD Linker
+  "-Zshare-generics=y",                                   # (Nightly) Make the current crate share its generic instantiations
 ]
 
 [target.aarch64-apple-darwin]
 rustflags = [
-    "-C",
-    "link-arg=-fuse-ld=/opt/homebrew/opt/llvm/bin/ld64.lld",
-    "-Zshare-generics=y",
+  "-Clink-arg=-fuse-ld=/opt/homebrew/opt/llvm/bin/ld64.lld", # Use LLD Linker
+  "-Zshare-generics=y",                                      # (Nightly) Make the current crate share its generic instantiations
 ]
 
 [target.x86_64-pc-windows-msvc]
-linker = "rust-lld.exe"
+linker = "rust-lld.exe"            # Use LLD Linker
 rustflags = ["-Zshare-generics=n"]
 
 # Optional: Uncommenting the following improves compile times, but reduces the amount of debug info to 'line number tables only'

.github/contributing/engine_style_guide.md

@@ -2,7 +2,7 @@
 
 ## Contributing
 
-For more advice on contributing to the engine, see the [relevant section](../../CONTRIBUTING.md#Contributing-your-own-ideas) of `CONTRIBUTING.md`.
+For more advice on contributing to the engine, see the [relevant section](../../CONTRIBUTING.md#Contributing-code) of `CONTRIBUTING.md`.
 
 ## General guidelines
 

.github/start-mobile-example/specs/screenshot.js

@@ -1,4 +1,3 @@
-var assert = require('assert');
 const percyScreenshot = require('@percy/appium-app');
 
 

.github/start-wasm-example/tests/wasm_example.spec.ts

@@ -1,4 +1,4 @@
-import { test, expect, Page } from '@playwright/test';
+import { test, expect } from '@playwright/test';
 
 test.beforeEach(async ({ page }) => {
   await page.goto('http://localhost:8000/');
@@ -7,19 +7,19 @@ test.beforeEach(async ({ page }) => {
 const MAX_TIMEOUT_FOR_TEST = 300_000;
 
 test.describe('WASM example', () => {
-  test('Wait for success', async ({ page }, test_info) => {
+  test('Wait for success', async ({ page }, testInfo) => {
     let start = new Date().getTime();
 
     let found = false;
     while (new Date().getTime() - start < MAX_TIMEOUT_FOR_TEST) {
-      let msg = await promise_with_timeout(100, on_console(page), "no log found");
+      let msg = await promiseWithTimeout(100, onConsole(page), "no log found");
       if (msg.includes("no log found")) {
         continue;
       }
       console.log(msg);
       if (msg.includes("Test successful")) {
         let prefix = process.env.SCREENSHOT_PREFIX === undefined ? "screenshot" : process.env.SCREENSHOT_PREFIX;
-        await page.screenshot({ path: `${prefix}-${test_info.project.name}.png`, fullPage: true });
+        await page.screenshot({ path: `${prefix}-${testInfo.project.name}.png`, fullPage: true });
         found = true;
         break;
       }
@@ -30,20 +30,20 @@ test.describe('WASM example', () => {
 
 });
 
-function on_console(page) {
+function onConsole(page) {
   return new Promise(resolve => {
     page.on('console', msg => resolve(msg.text()));
   });
 }
 
-async function promise_with_timeout(time_limit, task, failure_value) {
+async function promiseWithTimeout(timeLimit, task, failureValue) {
   let timeout;
-  const timeout_promise = new Promise((resolve, reject) => {
+  const timeoutPromise = new Promise((resolve, reject) => {
     timeout = setTimeout(() => {
-      resolve(failure_value);
-    }, time_limit);
+      resolve(failureValue);
+    }, timeLimit);
   });
-  const response = await Promise.race([task, timeout_promise]);
+  const response = await Promise.race([task, timeoutPromise]);
   if (timeout) {
     clearTimeout(timeout);
   }

.github/workflows/ci.yml

@@ -276,7 +276,7 @@ jobs:
       - name: log failed task - missing update
         if: ${{ failure() && github.event_name == 'pull_request' && steps.missing-update.conclusion == 'failure' }}
         run: touch ./missing-examples/missing-update
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: ${{ failure() && github.event_name == 'pull_request' }}
         with:
           name: missing-examples
@@ -310,7 +310,7 @@ jobs:
       - name: log failed task - missing update
         if: ${{ failure() && github.event_name == 'pull_request' && steps.missing-update.conclusion == 'failure' }}
         run: touch ./missing-features/missing-update
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: ${{ failure() && github.event_name == 'pull_request' }}
         with:
           name: missing-features
@@ -348,7 +348,7 @@ jobs:
         run: |
           mkdir -p ./msrv
           echo ${{ github.event.number }} > ./msrv/NR
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: ${{ failure() && github.event_name == 'pull_request' && steps.check.conclusion == 'failure' }}
         with:
           name: msrv

.github/workflows/daily.yml

@@ -120,7 +120,7 @@ jobs:
 
       - name: Save screenshots
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots-${{ matrix.device }}-${{ matrix.os_version }}
           path: .github/start-mobile-example/*.png

.github/workflows/dependencies.yml

@@ -29,36 +29,11 @@ jobs:
   check-bans:
     runs-on: ubuntu-latest
     steps:
-      # on main, prepare a new cargo tree output and cache it
-      - name: On main, prepare new cargo tree cache
-        if: github.ref == 'refs/heads/main'
-        run: cargo tree --depth 3 > cargo-tree-from-main
-      - name: On main, save the new cargo tree cache
-        if: github.ref == 'refs/heads/main'
-        uses: actions/cache/save@v3
-        with:
-          path: cargo-tree-from-main
-          key: cargo-tree-from-main    
-      # on other branch, restore the cached cargo tree output
-      - name: On PR, restore cargo tree cache
-        uses: actions/cache/restore@v3
-        if: github.ref != 'refs/heads/main'
-        with:
-          path: cargo-tree-from-main
-          key: cargo-tree-from-main
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
-      # if not on main, check that the cargo tree output is unchanged
-      - name: Check if the cargo tree changed from main
-        if: github.ref != 'refs/heads/main'
-        continue-on-error: true
-        id: cargo-tree-changed
-        run: diff cargo-tree-from-main <(cargo tree --depth 3)
       - name: Install cargo-deny
         run: cargo install cargo-deny
-      # if the check was not a success (either skipped because on main or failed because of a change), run the check
       - name: Check for banned and duplicated dependencies
-        if: steps.cargo-tree-changed.outcome != 'success'
         run: cargo deny check bans
 
   check-licenses:

.github/workflows/docs.yml

@@ -5,13 +5,30 @@ on:
     branches:
       - 'main'
 
+  # Allows running the action manually.
+  workflow_dispatch:
+
 env:
   CARGO_TERM_COLOR: always
   RUSTDOCFLAGS: --html-in-header header.html
 
+# Sets the permissions to allow deploying to Github pages.
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Only allow one deployment to run at a time, however it will not cancel in-progress runs.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -37,19 +54,18 @@ jobs:
       #   - A top level redirect to the bevy crate documentation
       #   - A CNAME file for redirecting the docs domain to the API reference
       #   - A robots.txt file to forbid any crawling of the site (to defer to the docs.rs site on search engines).
-      #   - A .nojekyll file to disable Jekyll GitHub Pages builds.
       - name: Finalize documentation
         run: |
           echo "<meta http-equiv=\"refresh\" content=\"0; url=bevy/index.html\">" > target/doc/index.html
           echo "dev-docs.bevyengine.org" > target/doc/CNAME
           echo "User-Agent: *\nDisallow: /" > target/doc/robots.txt
-          touch target/doc/.nojekyll
+          rm target/doc/.lock
 
-      - name: Deploy
-        if: github.repository == 'bevyengine/bevy'
-        uses: JamesIves/github-pages-deploy-action@v4
+      - name: Upload site artifact
+        uses: actions/upload-pages-artifact@v3
         with:
-          branch: gh-pages
-          folder: target/doc
-          single-commit: true
-          force: true
+          path: target/doc
+
+      - name: Deploy to Github Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/validation-jobs.yml

@@ -70,11 +70,11 @@ jobs:
         run: |
           sudo apt-get update;
           DEBIAN_FRONTEND=noninteractive sudo apt-get install --no-install-recommends -yq \
-            libasound2-dev libudev-dev;
+            libasound2-dev libudev-dev libxkbcommon-x11-0;
       - name: install xvfb, llvmpipe and lavapipe
         run: |
           sudo apt-get update -y -qq
-          sudo add-apt-repository ppa:kisak/kisak-mesa -y
+          sudo add-apt-repository ppa:kisak/turtle -y
           sudo apt-get update
           sudo apt install -y xvfb libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers
       - uses: actions/checkout@v4
@@ -108,16 +108,16 @@ jobs:
           zip traces.zip trace*.json
           zip -r screenshots.zip screenshots-*
       - name: save traces
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: example-traces.zip
           path: traces.zip
       - name: save screenshots
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots.zip
           path: screenshots.zip
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: ${{ failure() && github.event_name == 'pull_request' }}
         with:
           name: example-run
@@ -148,7 +148,7 @@ jobs:
       - name: install xvfb, llvmpipe and lavapipe
         run: |
           sudo apt-get update -y -qq
-          sudo add-apt-repository ppa:kisak/kisak-mesa -y
+          sudo add-apt-repository ppa:kisak/turtle -y
           sudo apt-get update
           sudo apt install -y xvfb libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers
 
@@ -175,7 +175,7 @@ jobs:
           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
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: .github/start-wasm-example/screenshot-*.png