From cb3ad652ba97c8a2d12fd80d99e07c765c60f5a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Sun, 29 Jan 2023 21:56:29 +0100 Subject: [PATCH 01/15] reduce CI --- .github/workflows/ci.yml | 201 --------------------------------------- 1 file changed, 201 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e48279ef73bc7..cac689f3cfe28 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,161 +2,12 @@ name: CI on: pull_request: - push: - branches-ignore: - - 'dependabot/**' - - staging-squash-merge.tmp env: CARGO_TERM_COLOR: always NIGHTLY_TOOLCHAIN: nightly jobs: - build: - strategy: - matrix: - os: [windows-latest, ubuntu-latest, macos-latest] - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v3 - - uses: actions/cache@v3 - with: - path: | - ~/.cargo/bin/ - ~/.cargo/registry/index/ - ~/.cargo/registry/cache/ - ~/.cargo/git/db/ - target/ - key: ${{ runner.os }}-cargo-build-stable-${{ hashFiles('**/Cargo.toml') }} - - uses: dtolnay/rust-toolchain@stable - - 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' - - name: Build & run tests - # See tools/ci/src/main.rs for the commands this runs - run: cargo run -p ci -- test - env: - CARGO_INCREMENTAL: 0 - RUSTFLAGS: "-C debuginfo=0 -D warnings" - - ci: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/cache@v3 - with: - path: | - ~/.cargo/bin/ - ~/.cargo/registry/index/ - ~/.cargo/registry/cache/ - ~/.cargo/git/db/ - target/ - key: ${{ runner.os }}-cargo-ci-${{ hashFiles('**/Cargo.toml') }} - - uses: dtolnay/rust-toolchain@stable - with: - components: rustfmt, clippy - - name: Install alsa and udev - run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev - - name: CI job - # See tools/ci/src/main.rs for the commands this runs - run: cargo run -p ci -- lints - - miri: - runs-on: ubuntu-latest - timeout-minutes: 60 - steps: - - uses: actions/checkout@v3 - - uses: actions/cache@v3 - with: - path: | - ~/.cargo/bin/ - ~/.cargo/registry/index/ - ~/.cargo/registry/cache/ - ~/.cargo/git/db/ - target/ - key: ${{ runner.os }}-cargo-miri-${{ hashFiles('**/Cargo.toml') }} - - uses: dtolnay/rust-toolchain@master - with: - toolchain: ${{ env.NIGHTLY_TOOLCHAIN }} - components: miri - - name: Install alsa and udev - run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev - - 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 - 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 - - check-compiles: - runs-on: ubuntu-latest - needs: ci - steps: - - uses: actions/checkout@v3 - - uses: actions/cache@v3 - with: - path: | - ~/.cargo/bin/ - ~/.cargo/registry/index/ - ~/.cargo/registry/cache/ - ~/.cargo/git/db/ - target/ - crates/bevy_ecs_compile_fail_tests/target/ - crates/bevy_reflect_compile_fail_tests/target/ - key: ${{ runner.os }}-cargo-check-compiles-${{ hashFiles('**/Cargo.toml') }} - - uses: dtolnay/rust-toolchain@stable - 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: Check Compile - # See tools/ci/src/main.rs for the commands this runs - run: cargo run -p ci -- compile - - build-wasm: - runs-on: ubuntu-latest - needs: build - steps: - - uses: actions/checkout@v3 - - uses: actions/cache@v3 - with: - path: | - ~/.cargo/bin/ - ~/.cargo/registry/index/ - ~/.cargo/registry/cache/ - ~/.cargo/git/db/ - target/ - key: ubuntu-assets-cargo-build-wasm-stable-${{ hashFiles('**/Cargo.toml') }} - - uses: dtolnay/rust-toolchain@stable - with: - target: wasm32-unknown-unknown - - name: Check wasm - run: cargo check --target wasm32-unknown-unknown - - markdownlint: - runs-on: ubuntu-latest - needs: check-missing-examples-in-docs - if: always() - steps: - - uses: actions/checkout@v3 - with: - # Full git history is needed to get a proper list of changed files within `super-linter` - fetch-depth: 0 - - name: Run Markdown Lint - uses: docker://ghcr.io/github/super-linter:slim-v4 - env: - MULTI_STATUS: false - VALIDATE_ALL_CODEBASE: false - VALIDATE_MARKDOWN: true - DEFAULT_BRANCH: main - run-examples: runs-on: ubuntu-latest timeout-minutes: 30 @@ -214,36 +65,6 @@ jobs: name: example-run path: example-run/ - check-doc: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/cache@v2 - with: - path: | - ~/.cargo/bin/ - ~/.cargo/registry/index/ - ~/.cargo/registry/cache/ - ~/.cargo/git/db/ - target/ - key: ${{ runner.os }}-check-doc-${{ hashFiles('**/Cargo.toml') }} - - uses: dtolnay/rust-toolchain@stable - - name: Install alsa and udev - run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev - if: runner.os == 'linux' - - name: Build and check doc - # See tools/ci/src/main.rs for the commands this runs - run: cargo run -p ci -- doc - env: - CARGO_INCREMENTAL: 0 - RUSTFLAGS: "-C debuginfo=0" - # This currently report a lot of false positives - # Enable it again once it's fixed - https://github.com/bevyengine/bevy/issues/1983 - # - name: Installs cargo-deadlinks - # run: cargo install --force cargo-deadlinks - # - name: Checks dead links - # run: cargo deadlinks --dir target/doc/bevy - # continue-on-error: true check-missing-examples-in-docs: runs-on: ubuntu-latest @@ -277,28 +98,6 @@ jobs: name: missing-examples path: missing-examples/ - check-unused-dependencies: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/cache@v3 - with: - path: | - ~/.cargo/bin/ - ~/.cargo/registry/index/ - ~/.cargo/registry/cache/ - ~/.cargo/git/db/ - target/ - key: ${{ runner.os }}-cargo-check-unused-dependencies-${{ hashFiles('**/Cargo.toml') }} - - uses: dtolnay/rust-toolchain@master - with: - toolchain: ${{ env.NIGHTLY_TOOLCHAIN }} - - name: Installs cargo-udeps - run: cargo install --force cargo-udeps - - name: Install alsa and udev - run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev - - name: Run cargo udeps - run: cargo udeps msrv: runs-on: ubuntu-latest From 8270a46742abc291b675e4727bd54f04056b2f39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Sun, 29 Jan 2023 21:57:34 +0100 Subject: [PATCH 02/15] reduce CI bis --- .github/workflows/dependencies.yml | 60 ------------------------------ 1 file changed, 60 deletions(-) delete mode 100644 .github/workflows/dependencies.yml diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml deleted file mode 100644 index a0a171e523b3c..0000000000000 --- a/.github/workflows/dependencies.yml +++ /dev/null @@ -1,60 +0,0 @@ -name: Dependencies - -on: - pull_request: - paths: - - '**/Cargo.toml' - - 'deny.toml' - push: - paths: - - '**/Cargo.toml' - - 'deny.toml' - branches-ignore: - - 'dependabot/**' - - staging-squash-merge.tmp - schedule: - - cron: "0 0 * * 0" - -env: - CARGO_TERM_COLOR: always - -jobs: - check-advisories: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@stable - - name: Install cargo-deny - run: cargo install cargo-deny - - name: Check for security advisories and unmaintained crates - run: cargo deny check advisories - - check-bans: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@stable - - name: Install cargo-deny - run: cargo install cargo-deny - - name: Check for banned and duplicated dependencies - run: cargo deny check bans - - check-licenses: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@stable - - name: Install cargo-deny - run: cargo install cargo-deny - - name: Check for unauthorized licenses - run: cargo deny check licenses - - check-sources: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@stable - - name: Install cargo-deny - run: cargo install cargo-deny - - name: Checked for unauthorized crate sources - run: cargo deny check sources From 744338ac9efe2435872f18decabc887a0ef2716c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Sun, 29 Jan 2023 21:59:08 +0100 Subject: [PATCH 03/15] finish nuking CI --- .github/workflows/docs.yml | 54 --------- .github/workflows/post-release.yml | 59 ---------- .github/workflows/release.yml | 56 --------- .github/workflows/validation-jobs.yml | 163 -------------------------- 4 files changed, 332 deletions(-) delete mode 100644 .github/workflows/docs.yml delete mode 100644 .github/workflows/post-release.yml delete mode 100644 .github/workflows/release.yml delete mode 100644 .github/workflows/validation-jobs.yml diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml deleted file mode 100644 index d58d174409e91..0000000000000 --- a/.github/workflows/docs.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: Deploy Docs - -on: - push: - branches: - - 'main' - -env: - CARGO_TERM_COLOR: always - RUSTDOCFLAGS: --html-in-header header.html - -jobs: - build-and-deploy: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Install Rust - uses: dtolnay/rust-toolchain@stable - - - name: Install alsa and udev - run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev - - # This does the following: - # - Replaces the docs icon with one that clearly denotes it's not the released package on crates.io - # - Adds a meta tag that forces Google not to index any page on the site. - - name: Pre-docs-build - run: | - sed -i.bak "s/icon.png/icon-docs-dev.png/" src/lib.rs - echo "" > header.html - - - name: Build docs - run: cargo doc --all-features --no-deps -p bevy - - # This adds the following: - # - 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 "" > target/doc/index.html - echo "dev-docs.bevyengine.org" > target/doc/CNAME - echo "User-Agent: *\nDisallow: /" > target/doc/robots.txt - touch target/doc/.nojekyll - - - name: Deploy - uses: JamesIves/github-pages-deploy-action@v4 - with: - branch: gh-pages - folder: target/doc - single-commit: true - force: true diff --git a/.github/workflows/post-release.yml b/.github/workflows/post-release.yml deleted file mode 100644 index 05f76605d4818..0000000000000 --- a/.github/workflows/post-release.yml +++ /dev/null @@ -1,59 +0,0 @@ -name: Post-release version bump - -# how to trigger: https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow -on: - workflow_dispatch: - -env: - CARGO_TERM_COLOR: always - -jobs: - ci: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - name: Install cargo-release - run: cargo install cargo-release - - - name: Setup post-release version bump - run: | - # Set the commit author to the github-actions bot. See discussion here for more information: - # https://github.com/actions/checkout/issues/13#issuecomment-724415212 - # https://github.community/t/github-actions-bot-email-address/17204/6 - git config user.name 'Bevy Auto Releaser' - git config user.email '41898282+github-actions[bot]@users.noreply.github.com' - # Read the current version from Cargo.toml - current_version=$(cargo metadata --format-version 1 --no-deps | \ - jq --raw-output '.packages | .[] | select(.name == "bevy").version') - # Sanity check: current version should be 0.X.Y - if ! grep -q '^0\.[0-9]\+\.[0-9]\+$' <<< "${current_version}"; then - echo "Invalid version (not in 0.X.Y format): ${current_version}" - exit 1 - fi - minor_version=$(sed 's/^0\.\([0-9]\+\).*/\1/' <<< "${current_version}") - next_version=0.$((minor_version + 1)).0-dev - echo "Bumping version to ${next_version}" - # See release.yml for meaning of these arguments - cargo release "${next_version}" \ - --workspace \ - --no-publish \ - --execute \ - --no-tag \ - --no-confirm \ - --no-push \ - --exclude ci \ - --exclude errors \ - --exclude bevy-ios-example \ - --exclude spancmp \ - --exclude build-wasm-example - - - name: Create PR - uses: peter-evans/create-pull-request@v4 - with: - delete-branch: true - base: "main" - title: "Bump Version after Release" - body: | - Bump version after release - This PR has been auto-generated diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index ac86f77b2e694..0000000000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,56 +0,0 @@ -name: Release - -# how to trigger: https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow -on: - workflow_dispatch: - -env: - CARGO_TERM_COLOR: always - -jobs: - ci: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - name: Install cargo-release - run: cargo install cargo-release - - - name: Setup release - run: | - # Set the commit author to the github-actions bot. See discussion here for more information: - # https://github.com/actions/checkout/issues/13#issuecomment-724415212 - # https://github.community/t/github-actions-bot-email-address/17204/6 - git config user.name 'Bevy Auto Releaser' - git config user.email '41898282+github-actions[bot]@users.noreply.github.com' - # release: remove the dev suffix, like going from 0.X.0-dev to 0.X.0 - # --workspace: updating all crates in the workspace - # --no-publish: do not publish to crates.io - # --execute: not a dry run - # --no-tag: do not push tag for each new version - # --no-push: do not push the update commits - # --dependent-version upgrade: change 0.X.0-dev in internal dependencies to 0.X.0 - # --exclude: ignore those packages - cargo release release \ - --workspace \ - --no-publish \ - --execute \ - --no-tag \ - --no-confirm \ - --no-push \ - --dependent-version upgrade \ - --exclude ci \ - --exclude errors \ - --exclude bevy-ios-example \ - --exclude spancmp \ - --exclude build-wasm-example - - - name: Create PR - uses: peter-evans/create-pull-request@v4 - with: - delete-branch: true - base: "main" - title: "Preparing Next Release" - body: | - Preparing next release - This PR has been auto-generated diff --git a/.github/workflows/validation-jobs.yml b/.github/workflows/validation-jobs.yml deleted file mode 100644 index 7a35bf314e9c8..0000000000000 --- a/.github/workflows/validation-jobs.yml +++ /dev/null @@ -1,163 +0,0 @@ -name: validation jobs - -on: - push: - branches: - - staging - - trying - - main - -env: - CARGO_TERM_COLOR: always - -jobs: - build-and-install-on-iOS: - runs-on: macos-latest - steps: - - uses: actions/checkout@v3 - - - uses: dtolnay/rust-toolchain@stable - - - uses: actions/cache@v3 - with: - path: | - target - key: ${{ runner.os }}-ios-install-${{ matrix.toolchain }}-${{ hashFiles('**/Cargo.lock') }} - - - name: Add iOS targets - run: rustup target add aarch64-apple-ios x86_64-apple-ios - - - name: Build and install iOS app in iOS Simulator. - run: cd examples/ios && make install - - build-android: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - - uses: dtolnay/rust-toolchain@stable - - - uses: actions/cache@v3 - with: - path: | - ~/.cargo/bin/ - ~/.cargo/registry/index/ - ~/.cargo/registry/cache/ - ~/.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: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME cargo apk build --package bevy-android-example - - run-examples-on-windows-dx12: - runs-on: windows-latest - timeout-minutes: 60 - steps: - - uses: actions/checkout@v3 - - - uses: dtolnay/rust-toolchain@stable - - - uses: actions/cache@v3 - with: - path: | - ~/.cargo/bin/ - ~/.cargo/registry/index/ - ~/.cargo/registry/cache/ - ~/.cargo/git/db/ - target/ - 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: | - 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 - run: | - for example in .github/example-run/*.ron; do - example_name=`basename $example .ron` - echo "running $example_name - "`date` - time WGPU_BACKEND=dx12 CI_TESTING_CONFIG=$example cargo run --example $example_name --features "bevy_ci_testing" - sleep 10 - done - - run-examples-on-wasm: - runs-on: ubuntu-latest - timeout-minutes: 60 - steps: - - uses: actions/checkout@v3 - - - uses: dtolnay/rust-toolchain@stable - with: - target: wasm32-unknown-unknown - - - uses: actions/cache@v3 - with: - path: | - ~/.cargo/bin/ - ~/.cargo/registry/index/ - ~/.cargo/registry/cache/ - ~/.cargo/git/db/ - ~/.github/start-wasm-example/node_modules - target/ - key: ${{ runner.os }}-wasm-run-examples-${{ hashFiles('**/Cargo.toml') }} - - - name: install xvfb, llvmpipe and lavapipe - run: | - sudo apt-get update -y -qq - sudo add-apt-repository ppa:oibaf/graphics-drivers -y - sudo apt-get update - sudo apt install -y xvfb libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers - - - name: Install wasm-bindgen - run: cargo install --force wasm-bindgen-cli - - - name: Setup playwright - run: | - cd .github/start-wasm-example - npm install - npx playwright install --with-deps - cd ../.. - - - name: First WASM build - run: | - cargo build --release --example ui --target wasm32-unknown-unknown - - - name: Run examples - shell: bash - run: | - # 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 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: dtolnay/rust-toolchain@stable - - 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" From 5c5b94957df2c445cb8f9a705c4c9d4adc974f29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Sun, 29 Jan 2023 22:09:03 +0100 Subject: [PATCH 04/15] more slimming --- .github/example-run/breakout.ron | 3 --- .github/example-run/contributors.ron | 3 --- .github/example-run/load_gltf.ron | 3 --- .github/example-run/minimising.ron | 3 --- .github/example-run/no_renderer.ron | 3 --- .github/example-run/resizing.ron | 4 ---- .github/example-run/scene.ron | 3 --- 7 files changed, 22 deletions(-) delete mode 100644 .github/example-run/breakout.ron delete mode 100644 .github/example-run/contributors.ron delete mode 100644 .github/example-run/load_gltf.ron delete mode 100644 .github/example-run/minimising.ron delete mode 100644 .github/example-run/no_renderer.ron delete mode 100644 .github/example-run/resizing.ron delete mode 100644 .github/example-run/scene.ron diff --git a/.github/example-run/breakout.ron b/.github/example-run/breakout.ron deleted file mode 100644 index 1d78f6a73ad80..0000000000000 --- a/.github/example-run/breakout.ron +++ /dev/null @@ -1,3 +0,0 @@ -( - exit_after: Some(900) -) diff --git a/.github/example-run/contributors.ron b/.github/example-run/contributors.ron deleted file mode 100644 index 1d78f6a73ad80..0000000000000 --- a/.github/example-run/contributors.ron +++ /dev/null @@ -1,3 +0,0 @@ -( - exit_after: Some(900) -) diff --git a/.github/example-run/load_gltf.ron b/.github/example-run/load_gltf.ron deleted file mode 100644 index d170958d73bad..0000000000000 --- a/.github/example-run/load_gltf.ron +++ /dev/null @@ -1,3 +0,0 @@ -( - exit_after: Some(300) -) diff --git a/.github/example-run/minimising.ron b/.github/example-run/minimising.ron deleted file mode 100644 index e8577916525db..0000000000000 --- a/.github/example-run/minimising.ron +++ /dev/null @@ -1,3 +0,0 @@ -( - exit_after: Some(90) -) diff --git a/.github/example-run/no_renderer.ron b/.github/example-run/no_renderer.ron deleted file mode 100644 index 22e43495b5e42..0000000000000 --- a/.github/example-run/no_renderer.ron +++ /dev/null @@ -1,3 +0,0 @@ -( - exit_after: Some(100) -) diff --git a/.github/example-run/resizing.ron b/.github/example-run/resizing.ron deleted file mode 100644 index f4914e281bcd6..0000000000000 --- a/.github/example-run/resizing.ron +++ /dev/null @@ -1,4 +0,0 @@ -( - // Ensures that the full cycle will run - exit_after: Some(410) -) diff --git a/.github/example-run/scene.ron b/.github/example-run/scene.ron deleted file mode 100644 index 22e43495b5e42..0000000000000 --- a/.github/example-run/scene.ron +++ /dev/null @@ -1,3 +0,0 @@ -( - exit_after: Some(100) -) From abe85522ceb0f31426e15df2ad202be26ca57c5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Sun, 29 Jan 2023 22:33:45 +0100 Subject: [PATCH 05/15] quoting --- .github/workflows/ci-comment-failures.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-comment-failures.yml b/.github/workflows/ci-comment-failures.yml index b3a9f0790d230..699ee234eb5fa 100644 --- a/.github/workflows/ci-comment-failures.yml +++ b/.github/workflows/ci-comment-failures.yml @@ -60,7 +60,7 @@ jobs: owner: context.repo.owner, repo: context.repo.repo, issue_number: issue_number, - body: 'Example ' + last_example_run + ' failed to run, please try running it locally and check the result.' + body: 'Example `' + last_example_run + '` failed to run, please try running it locally and check the result.' }); missing-examples: From 1609d43a44dd098f202fba330be78bc4016ca8d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Sun, 29 Jan 2023 21:44:07 +0100 Subject: [PATCH 06/15] example --- examples/games/alien_cake_addict.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/games/alien_cake_addict.rs b/examples/games/alien_cake_addict.rs index bc4f04bd1ac6c..e01a45b4025ed 100644 --- a/examples/games/alien_cake_addict.rs +++ b/examples/games/alien_cake_addict.rs @@ -15,6 +15,7 @@ enum GameState { struct BonusSpawnTimer(Timer); fn main() { + panic!(); App::new() .init_resource::() .insert_resource(BonusSpawnTimer(Timer::from_seconds( From 51c80cc12c5571175f867e2a638f928f2c1113fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Sun, 29 Jan 2023 22:12:49 +0100 Subject: [PATCH 07/15] fix saving example name --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cac689f3cfe28..7de3381017489 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,7 +58,7 @@ jobs: run: | mkdir -p ./example-run echo ${{ github.event.number }} > ./example-run/NR - mv last_example_run > ./example-run/ + mv last_example_run > ./example-run/last_example_run - uses: actions/upload-artifact@v2 if: ${{ failure() && github.event_name == 'pull_request' }} with: From f33ecf52864b5003e4851546808f26d55542f4ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Sun, 29 Jan 2023 22:14:44 +0100 Subject: [PATCH 08/15] adad --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7de3381017489..4cbf057f7872c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,7 +101,6 @@ jobs: msrv: runs-on: ubuntu-latest - needs: build steps: - uses: actions/checkout@v3 - uses: actions/cache@v3 From db6dfb9dc10a708da9654d9fa8ad73794baffeeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Sun, 29 Jan 2023 22:20:11 +0100 Subject: [PATCH 09/15] dzdz --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4cbf057f7872c..dfee63055b40c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,7 +58,7 @@ jobs: run: | mkdir -p ./example-run echo ${{ github.event.number }} > ./example-run/NR - mv last_example_run > ./example-run/last_example_run + mv last_example_run ./example-run/ - uses: actions/upload-artifact@v2 if: ${{ failure() && github.event_name == 'pull_request' }} with: From 6f3cddfb62c50937158cdabb6d0254692277a1c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Sun, 29 Jan 2023 22:25:37 +0100 Subject: [PATCH 10/15] fzdf --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dfee63055b40c..4dfc3ce5a0e4f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: run: | for example in .github/example-run/*.ron; do example_name=`basename $example .ron` - echo $example > last_example_run + echo $example_name > last_example_run echo "running $example_name - "`date` 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" sleep 10 From 8e60c46f22a1bf7f5e853026172a3189ed2d87ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Sun, 29 Jan 2023 22:32:55 +0100 Subject: [PATCH 11/15] fz --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4dfc3ce5a0e4f..b873bd33ec192 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: run: | for example in .github/example-run/*.ron; do example_name=`basename $example .ron` - echo $example_name > last_example_run + echo -n $example_name > last_example_run echo "running $example_name - "`date` 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" sleep 10 From 777c1c1fe1e769bb7064e25640bc877609124880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Sun, 29 Jan 2023 22:46:30 +0100 Subject: [PATCH 12/15] dzdzd --- examples/games/alien_cake_addict.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/games/alien_cake_addict.rs b/examples/games/alien_cake_addict.rs index e01a45b4025ed..bc4f04bd1ac6c 100644 --- a/examples/games/alien_cake_addict.rs +++ b/examples/games/alien_cake_addict.rs @@ -15,7 +15,6 @@ enum GameState { struct BonusSpawnTimer(Timer); fn main() { - panic!(); App::new() .init_resource::() .insert_resource(BonusSpawnTimer(Timer::from_seconds( From cb553292b120eac96818630f4d17819a443e6074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Sun, 29 Jan 2023 22:55:53 +0100 Subject: [PATCH 13/15] zdf --- .github/workflows/ci-comment-failures.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-comment-failures.yml b/.github/workflows/ci-comment-failures.yml index 699ee234eb5fa..2329c6c140e04 100644 --- a/.github/workflows/ci-comment-failures.yml +++ b/.github/workflows/ci-comment-failures.yml @@ -104,7 +104,7 @@ jobs: script: | var fs = require('fs'); var issue_number = Number(fs.readFileSync('./NR')); - if (existsSync('./missing-metadata')) { + if (fs.existsSync('./missing-metadata')) { await github.rest.issues.createComment({ owner: context.repo.owner, repo: context.repo.repo, @@ -112,7 +112,7 @@ jobs: body: 'You added a new example but didn't add metadata for it. Please update the root Cargo.toml file.' }); } - if (existsSync('./missing-update')) { + if (fs.existsSync('./missing-update')) { await github.rest.issues.createComment({ owner: context.repo.owner, repo: context.repo.repo, From 37eef0d6cd460ad70cb829053c59ac812f2435a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Sun, 29 Jan 2023 23:04:42 +0100 Subject: [PATCH 14/15] dzdzed --- .github/workflows/ci-comment-failures.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-comment-failures.yml b/.github/workflows/ci-comment-failures.yml index 2329c6c140e04..c5bf3007edc02 100644 --- a/.github/workflows/ci-comment-failures.yml +++ b/.github/workflows/ci-comment-failures.yml @@ -109,7 +109,7 @@ jobs: owner: context.repo.owner, repo: context.repo.repo, issue_number: issue_number, - body: 'You added a new example but didn't add metadata for it. Please update the root Cargo.toml file.' + body: 'You added a new example but didn\'t add metadata for it. Please update the root Cargo.toml file.' }); } if (fs.existsSync('./missing-update')) { @@ -117,7 +117,7 @@ jobs: owner: context.repo.owner, repo: context.repo.repo, issue_number: issue_number, - body: 'You added a new example but didn't update the readme. Please run `cargo run -p build-example-pages -- update` to update it, and commit the file change.' + body: 'You added a new example but didn\'t update the readme. Please run `cargo run -p build-example-pages -- update` to update it, and commit the file change.' }); } From 474118fbf5c678e4bcff917d79021805f8763ad2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 06:10:03 +0000 Subject: [PATCH 15/15] Update toml_edit requirement from 0.18 to 0.19 Updates the requirements on [toml_edit](https://github.com/ordian/toml_edit) to permit the latest version. - [Release notes](https://github.com/ordian/toml_edit/releases) - [Commits](https://github.com/ordian/toml_edit/compare/v0.18.0...v0.19.0) --- updated-dependencies: - dependency-name: toml_edit dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- crates/bevy_macro_utils/Cargo.toml | 2 +- tools/build-example-pages/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/bevy_macro_utils/Cargo.toml b/crates/bevy_macro_utils/Cargo.toml index 161d2e34eec54..866df666ee6aa 100644 --- a/crates/bevy_macro_utils/Cargo.toml +++ b/crates/bevy_macro_utils/Cargo.toml @@ -9,6 +9,6 @@ license = "MIT OR Apache-2.0" keywords = ["bevy"] [dependencies] -toml_edit = "0.18" +toml_edit = "0.19" syn = "1.0" quote = "1.0" diff --git a/tools/build-example-pages/Cargo.toml b/tools/build-example-pages/Cargo.toml index 9129ac1c9e206..d4af07b0a1b92 100644 --- a/tools/build-example-pages/Cargo.toml +++ b/tools/build-example-pages/Cargo.toml @@ -7,7 +7,7 @@ publish = false license = "MIT OR Apache-2.0" [dependencies] -toml_edit = "0.18" +toml_edit = "0.19" tera = "1.15" serde = { version = "1.0", features = [ "derive" ] } bitflags = "1.3"