Bump Bevy release candidate (#143)

* bump release candidate * bump release candidate * optimize ci matrix * don't run many checks on same branch * add missing example link * fix missing commas * fix missing dolah
makspll · Nov 10, 2024 · 2afb31f · 2afb31f
1 parent 0a7a22b
commit 2afb31f
Show file tree

Hide file tree

Showing 14 changed files with 4,162 additions and 4,393 deletions.
diff --git a/.github/workflows/bevy_mod_scripting.yml b/.github/workflows/bevy_mod_scripting.yml
@@ -12,22 +12,29 @@ on:
 
 name: Check and Lint - bevy_mod_scripting
 
+concurrency:
+  # Use github.run_id on main branch
+  # Use github.event.pull_request.number on pull requests, so it's unique per pull request
+  # Use github.ref on other branches, so it's unique per branch
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   check:
-    name: Check
+    name: Check - ${{ matrix.run_args.label }}
     runs-on: ${{ matrix.run_args.os }}
     strategy:
       matrix:
        run_args: [ 
-        {os: windows-latest,      lua: lua54,     cross: x86_64-pc-windows-msvc}, 
-        {os: macOS-latest,        lua: lua54,     cross: x86_64-apple-darwin},
-        {os: ubuntu-latest,       lua: lua54,     cross: aarch64-unknown-linux-gnu},
-        {os: ubuntu-latest,       lua: lua51,     cross: x86_64-unknown-linux-gnu}, 
-        {os: ubuntu-latest,       lua: lua52,     cross: x86_64-unknown-linux-gnu}, 
-        {os: ubuntu-latest,       lua: lua53,     cross: x86_64-unknown-linux-gnu}, 
-        {os: ubuntu-latest,       lua: lua54,     cross: x86_64-unknown-linux-gnu}, 
-        {os: ubuntu-latest,       lua: luajit,    cross: x86_64-unknown-linux-gnu}, 
-        {os: ubuntu-latest,       lua: luajit52,  cross: x86_64-unknown-linux-gnu}
+        {label: Windows - All Features,        os: windows-latest,      features: "lua54,rhai,teal,lua_script_api,rhai_script_api,rune",      cross: x86_64-pc-windows-msvc    }, 
+        {label: MacOS - All Features,          os: macOS-latest,        features: "lua54,rhai,teal,lua_script_api,rhai_script_api,rune",      cross: x86_64-apple-darwin       },
+        {label: Ubuntu - All Features,         os: ubuntu-latest,       features: "lua54,lua_script_api,rhai,teal,rhai_script_api,rune",      cross: x86_64-unknown-linux-gnu  }, 
+        {label: Ubuntu Aarch64 - All Features, os: ubuntu-latest,       features: "lua54,rhai,teal,lua_script_api,rhai_script_api,rune",      cross: aarch64-unknown-linux-gnu },
+        {label: Ubuntu - Lua51,                os: ubuntu-latest,       features: "lua51,lua_script_api",                                     cross: x86_64-unknown-linux-gnu  }, 
+        {label: Ubuntu - Lua52,                os: ubuntu-latest,       features: "lua52,lua_script_api",                                     cross: x86_64-unknown-linux-gnu  }, 
+        {label: Ubuntu - Lua53,                os: ubuntu-latest,       features: "lua53,lua_script_api",                                     cross: x86_64-unknown-linux-gnu  }, 
+        {label: Ubuntu - Luajit,               os: ubuntu-latest,       features: "luajit,lua_script_api",                                    cross: x86_64-unknown-linux-gnu  }, 
+        {label: Ubuntu - Luajit52,             os: ubuntu-latest,       features: "luajit52,lua_script_api",                                  cross: x86_64-unknown-linux-gnu  }
       ]
     steps:
       - if: runner.os == 'linux'
@@ -48,7 +55,7 @@ jobs:
         with:
           command: check
           target: ${{ matrix.run_args.cross }}
-          args: --workspace --features=${{ matrix.run_args.lua }},rhai,teal,lua_script_api,rhai_script_api,rune --profile=ephemeral-build
+          args: --workspace --features=${{ matrix.run_args.features }} --profile=ephemeral-build
 
   fmt:
     name: Rustfmt

diff --git a/Cargo.toml b/Cargo.toml
@@ -70,7 +70,7 @@ bevy_script_api = { path = "crates/bevy_script_api", version = "0.8.0-alpha.0",
 
 
 [workspace.dependencies]
-bevy = { version = "0.15.0-rc.2", default-features = false }
+bevy = { version = "0.15.0-rc.3", default-features = false }
 bevy_mod_scripting_core = { path = "crates/bevy_mod_scripting_core", version = "0.8.0-alpha.0" }
 bevy_mod_scripting_common = { path = "crates/bevy_mod_scripting_common", version = "0.8.0-alpha.0" }
 

diff --git a/crates/bevy_script_api/src/providers/bevy_core.rs b/crates/bevy_script_api/src/providers/bevy_core.rs
@@ -14,6 +14,12 @@ use bevy_script_api::{
     remote = "bevy::core::prelude::Name",
     functions[r#"
 
+    #[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
+    fn clone(&self) -> bevy::core::prelude::Name;
+
+"#,
+    r#"
+
     #[lua(
         as_trait = "std::cmp::PartialEq",
         kind = "MetaFunction",
@@ -22,12 +28,6 @@ use bevy_script_api::{
     )]
     fn eq(&self, #[proxy] other: &name::Name) -> bool;
 
-"#,
-    r#"
-
-    #[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
-    fn clone(&self) -> bevy::core::prelude::Name;
-
 "#,
     r#"
 #[lua(kind="MetaMethod", metamethod="ToString")]

diff --git a/crates/bevy_script_api/src/providers/bevy_ecs.rs b/crates/bevy_script_api/src/providers/bevy_ecs.rs
@@ -13,13 +13,8 @@ use bevy_script_api::{
     remote = "bevy::ecs::entity::Entity",
     functions[r#"
 
-    #[lua(
-        as_trait = "std::cmp::PartialEq",
-        kind = "MetaFunction",
-        composite = "eq",
-        metamethod = "Eq",
-    )]
-    fn eq(&self, #[proxy] other: &entity::Entity) -> bool;
+    #[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
+    fn clone(&self) -> bevy::ecs::entity::Entity;
 
 "#,
     r#"
@@ -78,8 +73,13 @@ use bevy_script_api::{
 "#,
     r#"
 
-    #[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
-    fn clone(&self) -> bevy::ecs::entity::Entity;
+    #[lua(
+        as_trait = "std::cmp::PartialEq",
+        kind = "MetaFunction",
+        composite = "eq",
+        metamethod = "Eq",
+    )]
+    fn eq(&self, #[proxy] other: &entity::Entity) -> bool;
 
 "#,
     r#"
@@ -144,18 +144,6 @@ struct OnReplace {}
     remote = "bevy::ecs::component::ComponentId",
     functions[r#"
 
-    #[lua(as_trait = "std::cmp::Eq", kind = "Method")]
-    fn assert_receiver_is_total_eq(&self) -> ();
-
-"#,
-    r#"
-
-    #[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
-    fn clone(&self) -> bevy::ecs::component::ComponentId;
-
-"#,
-    r#"
-
     #[lua(
         as_trait = "std::cmp::PartialEq",
         kind = "MetaFunction",
@@ -180,6 +168,18 @@ struct OnReplace {}
     #[lua(kind = "Method")]
     fn index(self) -> usize;
 
+"#,
+    r#"
+
+    #[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
+    fn clone(&self) -> bevy::ecs::component::ComponentId;
+
+"#,
+    r#"
+
+    #[lua(as_trait = "std::cmp::Eq", kind = "Method")]
+    fn assert_receiver_is_total_eq(&self) -> ();
+
 "#,
     r#"
 #[lua(kind="MetaMethod", metamethod="ToString")]
@@ -198,6 +198,17 @@ struct ComponentId();
     #[lua(as_trait = "std::cmp::Eq", kind = "Method")]
     fn assert_receiver_is_total_eq(&self) -> ();
 
+"#,
+    r#"
+
+    #[lua(
+        as_trait = "std::cmp::PartialEq",
+        kind = "MetaFunction",
+        composite = "eq",
+        metamethod = "Eq",
+    )]
+    fn eq(&self, #[proxy] other: &component::Tick) -> bool;
+
 "#,
     r#"
 
@@ -239,17 +250,6 @@ struct ComponentId();
         this_run: bevy::ecs::component::Tick,
     ) -> bool;
 
-"#,
-    r#"
-
-    #[lua(
-        as_trait = "std::cmp::PartialEq",
-        kind = "MetaFunction",
-        composite = "eq",
-        metamethod = "Eq",
-    )]
-    fn eq(&self, #[proxy] other: &component::Tick) -> bool;
-
 "#,
     r#"
 #[lua(kind="MetaMethod", metamethod="ToString")]
@@ -342,6 +342,12 @@ struct ComponentTicks {}
     remote = "bevy::ecs::identifier::Identifier",
     functions[r#"
 
+    #[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
+    fn clone(&self) -> bevy::ecs::identifier::Identifier;
+
+"#,
+    r#"
+
     #[lua(
         as_trait = "std::cmp::PartialEq",
         kind = "MetaFunction",
@@ -381,12 +387,6 @@ struct ComponentTicks {}
     #[lua(kind = "Function", output(proxy))]
     fn from_bits(value: u64) -> bevy::ecs::identifier::Identifier;
 
-"#,
-    r#"
-
-    #[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
-    fn clone(&self) -> bevy::ecs::identifier::Identifier;
-
 "#,
     r#"
 #[lua(kind="MetaMethod", metamethod="ToString")]

diff --git a/crates/bevy_script_api/src/providers/bevy_hierarchy.rs b/crates/bevy_script_api/src/providers/bevy_hierarchy.rs
@@ -34,6 +34,12 @@ struct Children();
     remote = "bevy::hierarchy::prelude::Parent",
     functions[r#"
 
+    #[lua(as_trait = "std::cmp::Eq", kind = "Method")]
+    fn assert_receiver_is_total_eq(&self) -> ();
+
+"#,
+    r#"
+
     #[lua(
         as_trait = "std::cmp::PartialEq",
         kind = "MetaFunction",
@@ -49,12 +55,6 @@ struct Children();
     #[lua(kind = "Method", output(proxy))]
     fn get(&self) -> bevy::ecs::entity::Entity;
 
-"#,
-    r#"
-
-    #[lua(as_trait = "std::cmp::Eq", kind = "Method")]
-    fn assert_receiver_is_total_eq(&self) -> ();
-
 "#,
     r#"
 #[lua(kind="MetaMethod", metamethod="ToString")]