Use GitHub Actions config from master branch (#217)

* Use GitHub Actions config from master branch

* Fix formatting

* Fix deprecation warnings on add_plugin

.github/workflows/ci-cron.yml

@@ -0,0 +1,45 @@
+name: CI-cron
+
+on:
+  schedule:
+    - cron: 0 9 * * *
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+
+  build:
+    strategy:
+      matrix:
+        toolchain: [stable, nightly]
+        os: [windows-latest, ubuntu-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: bevy-main
+
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ matrix.toolchain }}
+          components: rustfmt, clippy
+      - name: fmt
+        if: ${{ matrix.toolchain == 'nightly' && runner.os == 'linux' }}
+        run: cargo fmt --all -- --check
+
+      - 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: lint
+        uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --all-targets --all-features -- -D warnings -A unknown-lints
+
+      - name: Build & run tests
+        run: cargo test --workspace
+        env:
+          CARGO_INCREMENTAL: 0
+          RUSTFLAGS: "-C debuginfo=0 -D warnings"

.github/workflows/ci.yml

@@ -2,11 +2,9 @@ name: CI
 
 on:
   pull_request:
-    branches: [master]
+    branches: [master, bevy-main]
   push:
-    branches: [master]
-  schedule:
-    - cron: 0 9 * * *
+    branches: [master, bevy-main]
 
 env:
   CARGO_TERM_COLOR: always
@@ -20,20 +18,16 @@ jobs:
         os: [windows-latest, ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.toolchain }}
           components: rustfmt, clippy
-          override: true
       - name: fmt
         if: ${{ matrix.toolchain == 'nightly' && runner.os == 'linux' }}
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
-
+        run: cargo fmt --all -- --check
+
       - 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'

.github/workflows/dependencies.yml

@@ -24,11 +24,12 @@ jobs:
   check-advisories:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v3
+        with:
+          ref: bevy-main
+      - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable
-          override: true
       - name: Install cargo-deny
         run: cargo install cargo-deny
       - name: Check for security advisories and unmaintained crates
@@ -37,11 +38,12 @@ jobs:
   check-bans:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v3
+        with:
+          ref: bevy-main
+      - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable
-          override: true
       - name: Install cargo-deny
         run: cargo install cargo-deny
       - name: Check for banned and duplicated dependencies
@@ -50,11 +52,12 @@ jobs:
   check-licenses:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v3
+        with:
+          ref: bevy-main
+      - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable
-          override: true
       - name: Install cargo-deny
         run: cargo install cargo-deny
       - name: Check for unauthorized licenses
@@ -63,11 +66,12 @@ jobs:
   check-sources:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v3
+        with:
+          ref: bevy-main
+      - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable
-          override: true
       - name: Install cargo-deny
         run: cargo install cargo-deny
       - name: Checked for unauthorized crate sources

README.md

@@ -34,7 +34,7 @@ fn main() {
     App::new()
         .insert_resource(Msaa::Sample4)
         .add_plugins(DefaultPlugins)
-        .add_plugin(ShapePlugin)
+        .add_plugins(ShapePlugin)
         .add_systems(Startup, setup_system)
         .run();
 }

examples/dynamic_shape.rs

@@ -7,7 +7,7 @@ fn main() {
     App::new()
         .insert_resource(Msaa::Sample4)
         .add_plugins(DefaultPlugins)
-        .add_plugin(ShapePlugin)
+        .add_plugins(ShapePlugin)
         .add_systems(Startup, setup_system)
         .add_systems(Update, change_draw_mode_system)
         .add_systems(Update, change_number_of_sides)

examples/path.rs

@@ -5,7 +5,7 @@ fn main() {
     App::new()
         .insert_resource(Msaa::Sample4)
         .add_plugins(DefaultPlugins)
-        .add_plugin(ShapePlugin)
+        .add_plugins(ShapePlugin)
         .add_systems(Startup, setup_system)
         .run();
 }

examples/readme.rs

@@ -8,7 +8,7 @@ fn main() {
     App::new()
         .insert_resource(Msaa::Sample4)
         .add_plugins(DefaultPlugins)
-        .add_plugin(ShapePlugin)
+        .add_plugins(ShapePlugin)
         .add_systems(Startup, setup_system)
         .run();
 }

examples/rounded_polygon.rs

@@ -5,7 +5,7 @@ fn main() {
     App::new()
         .insert_resource(Msaa::Sample4)
         .add_plugins(DefaultPlugins)
-        .add_plugin(ShapePlugin)
+        .add_plugins(ShapePlugin)
         .add_systems(Startup, setup_system)
         .run();
 }

examples/svg.rs

@@ -6,7 +6,7 @@ fn main() {
         //Added msaa to reduce aliasing
         .insert_resource(Msaa::Sample4)
         .add_plugins(DefaultPlugins)
-        .add_plugin(ShapePlugin)
+        .add_plugins(ShapePlugin)
         .add_systems(Startup, setup_system)
         .run();
 }

src/plugin.rs

@@ -52,7 +52,7 @@ impl Plugin for ShapePlugin {
                 BuildShapes.after(bevy::transform::TransformSystem::TransformPropagate),
             )
             .add_systems(PostUpdate, mesh_shapes_system.in_set(BuildShapes))
-            .add_plugin(ShapeMaterialPlugin);
+            .add_plugins(ShapeMaterialPlugin);
     }
 }
 

src/render/mod.rs

@@ -24,7 +24,7 @@ impl Plugin for ShapeMaterialPlugin {
             Shader::from_wgsl
         );
 
-        app.add_plugin(Material2dPlugin::<ShapeMaterial>::default())
+        app.add_plugins(Material2dPlugin::<ShapeMaterial>::default())
             .register_asset_reflect::<ShapeMaterial>();
 
         app.world

src/shapes.rs

@@ -291,12 +291,12 @@ impl Geometry for Line {
 ///offset the coordinates of the paths
 ///
 ///In inkscape for example, to turn your units into pixels, you:
-///1) Go to File>Document Properties>General>Display Units and set it to px
+/// 1) Go to File>Document Properties>General>Display Units and set it to px
 ///
-///2) In File>Document Properties>Custom Size>Units set it to px, also, this
+/// 2) In File>Document Properties>Custom Size>Units set it to px, also, this
 /// size would be used for `svg_doc_size_in_px`
 ///
-///3) In File>Document Properties>Scale>Scale x make sure it is set to 1 User
+/// 3) In File>Document Properties>Scale>Scale x make sure it is set to 1 User
 /// unit per px
 ///
 ///Example exists in the examples folder