Skip to content

Commit 2afb31f

Browse files
makspllmakspll
authored
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
1 parent 0a7a22b commit 2afb31f

File tree

14 files changed

+4162
-4393
lines changed

14 files changed

+4162
-4393
lines changed

‎.github/workflows/bevy_mod_scripting.yml

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,29 @@ on:
1212

1313
name: Check and Lint - bevy_mod_scripting
1414

15+
concurrency:
16+
# Use github.run_id on main branch
17+
# Use github.event.pull_request.number on pull requests, so it's unique per pull request
18+
# Use github.ref on other branches, so it's unique per branch
19+
group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.event.pull_request.number || github.ref }}
20+
cancel-in-progress: true
21+
1522
jobs:
1623
check:
17-
name: Check
24+
name: Check - ${{ matrix.run_args.label }}
1825
runs-on: ${{ matrix.run_args.os }}
1926
strategy:
2027
matrix:
2128
run_args: [
22-
{os: windows-latest, lua: lua54, cross: x86_64-pc-windows-msvc},
23-
{os: macOS-latest, lua: lua54, cross: x86_64-apple-darwin},
24-
{os: ubuntu-latest, lua: lua54, cross: aarch64-unknown-linux-gnu},
25-
{os: ubuntu-latest, lua: lua51, cross: x86_64-unknown-linux-gnu},
26-
{os: ubuntu-latest, lua: lua52, cross: x86_64-unknown-linux-gnu},
27-
{os: ubuntu-latest, lua: lua53, cross: x86_64-unknown-linux-gnu},
28-
{os: ubuntu-latest, lua: lua54, cross: x86_64-unknown-linux-gnu},
29-
{os: ubuntu-latest, lua: luajit, cross: x86_64-unknown-linux-gnu},
30-
{os: ubuntu-latest, lua: luajit52, cross: x86_64-unknown-linux-gnu}
29+
{label: Windows - All Features, os: windows-latest, features: "lua54,rhai,teal,lua_script_api,rhai_script_api,rune", cross: x86_64-pc-windows-msvc },
30+
{label: MacOS - All Features, os: macOS-latest, features: "lua54,rhai,teal,lua_script_api,rhai_script_api,rune", cross: x86_64-apple-darwin },
31+
{label: Ubuntu - All Features, os: ubuntu-latest, features: "lua54,lua_script_api,rhai,teal,rhai_script_api,rune", cross: x86_64-unknown-linux-gnu },
32+
{label: Ubuntu Aarch64 - All Features, os: ubuntu-latest, features: "lua54,rhai,teal,lua_script_api,rhai_script_api,rune", cross: aarch64-unknown-linux-gnu },
33+
{label: Ubuntu - Lua51, os: ubuntu-latest, features: "lua51,lua_script_api", cross: x86_64-unknown-linux-gnu },
34+
{label: Ubuntu - Lua52, os: ubuntu-latest, features: "lua52,lua_script_api", cross: x86_64-unknown-linux-gnu },
35+
{label: Ubuntu - Lua53, os: ubuntu-latest, features: "lua53,lua_script_api", cross: x86_64-unknown-linux-gnu },
36+
{label: Ubuntu - Luajit, os: ubuntu-latest, features: "luajit,lua_script_api", cross: x86_64-unknown-linux-gnu },
37+
{label: Ubuntu - Luajit52, os: ubuntu-latest, features: "luajit52,lua_script_api", cross: x86_64-unknown-linux-gnu }
3138
]
3239
steps:
3340
- if: runner.os == 'linux'
@@ -48,7 +55,7 @@ jobs:
4855
with:
4956
command: check
5057
target: ${{ matrix.run_args.cross }}
51-
args: --workspace --features=${{ matrix.run_args.lua }},rhai,teal,lua_script_api,rhai_script_api,rune --profile=ephemeral-build
58+
args: --workspace --features=${{ matrix.run_args.features }} --profile=ephemeral-build
5259

5360
fmt:
5461
name: Rustfmt

‎Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ bevy_script_api = { path = "crates/bevy_script_api", version = "0.8.0-alpha.0",
7070

7171

7272
[workspace.dependencies]
73-
bevy = { version = "0.15.0-rc.2", default-features = false }
73+
bevy = { version = "0.15.0-rc.3", default-features = false }
7474
bevy_mod_scripting_core = { path = "crates/bevy_mod_scripting_core", version = "0.8.0-alpha.0" }
7575
bevy_mod_scripting_common = { path = "crates/bevy_mod_scripting_common", version = "0.8.0-alpha.0" }
7676

‎crates/bevy_script_api/src/providers/bevy_core.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ use bevy_script_api::{
1414
remote = "bevy::core::prelude::Name",
1515
functions[r#"
1616
17+
#[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
18+
fn clone(&self) -> bevy::core::prelude::Name;
19+
20+
"#,
21+
r#"
22+
1723
#[lua(
1824
as_trait = "std::cmp::PartialEq",
1925
kind = "MetaFunction",
@@ -22,12 +28,6 @@ use bevy_script_api::{
2228
)]
2329
fn eq(&self, #[proxy] other: &name::Name) -> bool;
2430
25-
"#,
26-
r#"
27-
28-
#[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
29-
fn clone(&self) -> bevy::core::prelude::Name;
30-
3131
"#,
3232
r#"
3333
#[lua(kind="MetaMethod", metamethod="ToString")]

‎crates/bevy_script_api/src/providers/bevy_ecs.rs

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,8 @@ use bevy_script_api::{
1313
remote = "bevy::ecs::entity::Entity",
1414
functions[r#"
1515
16-
#[lua(
17-
as_trait = "std::cmp::PartialEq",
18-
kind = "MetaFunction",
19-
composite = "eq",
20-
metamethod = "Eq",
21-
)]
22-
fn eq(&self, #[proxy] other: &entity::Entity) -> bool;
16+
#[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
17+
fn clone(&self) -> bevy::ecs::entity::Entity;
2318
2419
"#,
2520
r#"
@@ -78,8 +73,13 @@ use bevy_script_api::{
7873
"#,
7974
r#"
8075
81-
#[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
82-
fn clone(&self) -> bevy::ecs::entity::Entity;
76+
#[lua(
77+
as_trait = "std::cmp::PartialEq",
78+
kind = "MetaFunction",
79+
composite = "eq",
80+
metamethod = "Eq",
81+
)]
82+
fn eq(&self, #[proxy] other: &entity::Entity) -> bool;
8383
8484
"#,
8585
r#"
@@ -144,18 +144,6 @@ struct OnReplace {}
144144
remote = "bevy::ecs::component::ComponentId",
145145
functions[r#"
146146
147-
#[lua(as_trait = "std::cmp::Eq", kind = "Method")]
148-
fn assert_receiver_is_total_eq(&self) -> ();
149-
150-
"#,
151-
r#"
152-
153-
#[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
154-
fn clone(&self) -> bevy::ecs::component::ComponentId;
155-
156-
"#,
157-
r#"
158-
159147
#[lua(
160148
as_trait = "std::cmp::PartialEq",
161149
kind = "MetaFunction",
@@ -180,6 +168,18 @@ struct OnReplace {}
180168
#[lua(kind = "Method")]
181169
fn index(self) -> usize;
182170
171+
"#,
172+
r#"
173+
174+
#[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
175+
fn clone(&self) -> bevy::ecs::component::ComponentId;
176+
177+
"#,
178+
r#"
179+
180+
#[lua(as_trait = "std::cmp::Eq", kind = "Method")]
181+
fn assert_receiver_is_total_eq(&self) -> ();
182+
183183
"#,
184184
r#"
185185
#[lua(kind="MetaMethod", metamethod="ToString")]
@@ -198,6 +198,17 @@ struct ComponentId();
198198
#[lua(as_trait = "std::cmp::Eq", kind = "Method")]
199199
fn assert_receiver_is_total_eq(&self) -> ();
200200
201+
"#,
202+
r#"
203+
204+
#[lua(
205+
as_trait = "std::cmp::PartialEq",
206+
kind = "MetaFunction",
207+
composite = "eq",
208+
metamethod = "Eq",
209+
)]
210+
fn eq(&self, #[proxy] other: &component::Tick) -> bool;
211+
201212
"#,
202213
r#"
203214
@@ -239,17 +250,6 @@ struct ComponentId();
239250
this_run: bevy::ecs::component::Tick,
240251
) -> bool;
241252
242-
"#,
243-
r#"
244-
245-
#[lua(
246-
as_trait = "std::cmp::PartialEq",
247-
kind = "MetaFunction",
248-
composite = "eq",
249-
metamethod = "Eq",
250-
)]
251-
fn eq(&self, #[proxy] other: &component::Tick) -> bool;
252-
253253
"#,
254254
r#"
255255
#[lua(kind="MetaMethod", metamethod="ToString")]
@@ -342,6 +342,12 @@ struct ComponentTicks {}
342342
remote = "bevy::ecs::identifier::Identifier",
343343
functions[r#"
344344
345+
#[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
346+
fn clone(&self) -> bevy::ecs::identifier::Identifier;
347+
348+
"#,
349+
r#"
350+
345351
#[lua(
346352
as_trait = "std::cmp::PartialEq",
347353
kind = "MetaFunction",
@@ -381,12 +387,6 @@ struct ComponentTicks {}
381387
#[lua(kind = "Function", output(proxy))]
382388
fn from_bits(value: u64) -> bevy::ecs::identifier::Identifier;
383389
384-
"#,
385-
r#"
386-
387-
#[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
388-
fn clone(&self) -> bevy::ecs::identifier::Identifier;
389-
390390
"#,
391391
r#"
392392
#[lua(kind="MetaMethod", metamethod="ToString")]

‎crates/bevy_script_api/src/providers/bevy_hierarchy.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ struct Children();
3434
remote = "bevy::hierarchy::prelude::Parent",
3535
functions[r#"
3636
37+
#[lua(as_trait = "std::cmp::Eq", kind = "Method")]
38+
fn assert_receiver_is_total_eq(&self) -> ();
39+
40+
"#,
41+
r#"
42+
3743
#[lua(
3844
as_trait = "std::cmp::PartialEq",
3945
kind = "MetaFunction",
@@ -49,12 +55,6 @@ struct Children();
4955
#[lua(kind = "Method", output(proxy))]
5056
fn get(&self) -> bevy::ecs::entity::Entity;
5157
52-
"#,
53-
r#"
54-
55-
#[lua(as_trait = "std::cmp::Eq", kind = "Method")]
56-
fn assert_receiver_is_total_eq(&self) -> ();
57-
5858
"#,
5959
r#"
6060
#[lua(kind="MetaMethod", metamethod="ToString")]

0 commit comments

Comments
 (0)