Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Bevy release candidate #143

Merged
merged 8 commits into from
Nov 10, 2024
Merged

Bump Bevy release candidate #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
76a3d3d
bump release candidate
makspll Nov 10, 2024
3bc1338
bump release candidate
makspll Nov 10, 2024
575e1ba
optimize ci matrix
makspll Nov 10, 2024
779cbb0
Merge branch 'feature/bevy-rc-3' of github.com:makspll/bevy_mod_scrip…
makspll Nov 10, 2024
1fbe9a7
don't run many checks on same branch
makspll Nov 10, 2024
b1ee43c
add missing example link
makspll Nov 10, 2024
3329209
fix missing commas
makspll Nov 10, 2024
905d80c
fix missing dolah
makspll Nov 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions .github/workflows/bevy_mod_scripting.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }

Expand Down
12 changes: 6 additions & 6 deletions crates/bevy_script_api/src/providers/bevy_core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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")]
Expand Down
76 changes: 38 additions & 38 deletions crates/bevy_script_api/src/providers/bevy_ecs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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#"
Expand Down Expand Up @@ -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#"
Expand Down Expand Up @@ -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",
Expand All @@ -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")]
Expand All @@ -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#"

Expand Down Expand Up @@ -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")]
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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")]
Expand Down
12 changes: 6 additions & 6 deletions crates/bevy_script_api/src/providers/bevy_hierarchy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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")]
Expand Down
Loading
Loading