Compare commits

...
Author SHA1 Message Date
EIREXE 9684974298 Fix headless asset preprocessing hang
CI / build-and-test (pull_request) Successful in 1m7s
CI / production-build (pull_request) Successful in 4m49s
2026-09-19 20:51:58 +02:00
EIREXE ab6aec70c5 Fix processed RON assets being ignored (#48)
CI / build-and-test (push) Successful in 1m9s
CI / production-build (push) Canceled after 10m37s
## Summary
- share custom RON asset loaders between the game and asset processor
- register image, font, and glTF loaders in the headless processor
- prevent `game_settings.ron` and `game.stylesheet.ron` from receiving ignored processed metadata

Reviewed-on: #48
Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>
2026-09-19 18:09:40 +00:00
EIREXE de5d8eb030 Deploy production Linux builds to Steam (#47)
CI / production-build (push) Successful in 5m15s
CI / build-and-test (push) Successful in 1m8s
## Summary
- package the production Linux binary and Bevy assets under `build/linux`
- generate Steam TOTP credentials in CI
- deploy app 3409670 to the Steam `master` branch using the latest commit hash as the build description
- restrict packaging and deployment to pushes on `master`, excluding pull requests and manual runs

Reviewed-on: #47
Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>
2026-09-19 17:32:04 +00:00
EIREXE 0dc5d0392d Add production build pipeline (#46)
CI / build-and-test (push) Successful in 1m8s
CI / production-build (push) Successful in 4m39s
## Summary
- split development dynamic linking from production builds
- add headless processed-asset generation
- add a separate production CI cache and static Bevy/Rust linkage verification
- keep custom debug features enabled for production builds behind a feature gate

Reviewed-on: #46
Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>
2026-09-19 17:04:18 +00:00
9 changed files with 209 additions and 20 deletions
+75
View File
@@ -50,3 +50,78 @@ jobs:
- name: Run unit tests - name: Run unit tests
run: cargo test --locked --lib -j 4 run: cargo test --locked --lib -j 4
production-build:
runs-on: ubuntu-latest
timeout-minutes: 45
steps:
- name: Check out source
uses: actions/checkout@v4
- name: Install Rust toolchain
run: |
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \
sh -s -- -y --profile minimal
echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
"$HOME/.cargo/bin/rustup" toolchain install nightly-2026-09-14 --profile minimal
- name: Cache production Rust dependencies and build artifacts
uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
with:
prefix-key: v2-rust
shared-key: linux-nightly-production
cache-bin: false
- name: Install Linux dependencies
run: |
sudo apt-get update
sudo apt-get install --no-install-recommends -y \
clang \
libasound2-dev \
libudev-dev \
libusb-1.0-0-dev \
libwayland-dev \
libx11-dev \
libxkbcommon-dev \
libxkbcommon-x11-0 \
mesa-vulkan-drivers \
mold \
pkg-config
- name: Preprocess assets
run: cargo run --locked --bin process-assets --no-default-features --features debug_features -j 4
- name: Build production binary
run: cargo build --locked --profile production --no-default-features --features debug_features -j 4
- name: Verify production binary is not Bevy/Rust dynamically linked
run: |
! readelf -d target/production/shinespark | grep -E 'libbevy_dylib|libstd-.*\.so'
- name: Package Linux Steam depot
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
run: |
mkdir -p build/linux
cp target/production/shinespark build/linux/shinespark
cp -R assets build/linux/assets
cp -R imported_assets build/linux/imported_assets
- if: github.event_name == 'push' && github.ref == 'refs/heads/master'
uses: CyberAndrii/steam-totp@v1
name: Generate Steam TOTP
id: steam-totp
with:
shared_secret: ${{ secrets.STEAM_SHARED_SECRET }}
- name: Deploy Linux build to Steam
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
uses: game-ci/steam-deploy@v3
with:
username: ${{ secrets.STEAM_USERNAME }}
password: ${{ secrets.STEAM_PASSWORD }}
totp: ${{ steps.steam-totp.outputs.code }}
appId: 3409670
buildDescription: ${{ github.sha }}
rootPath: build
depot1Path: linux
releaseBranch: master
+12 -1
View File
@@ -6,8 +6,13 @@ authors = [""]
[workspace] [workspace]
[features]
default = ["development", "debug_features"]
development = ["bevy/dynamic_linking", "bevy/file_watcher"]
debug_features = ["bevy/free_camera"]
[dependencies] [dependencies]
bevy = { version = "0.19", features = ["asset_processor", "basis-universal", "dynamic_linking", "free_camera", "file_watcher", "bevy_settings"] } bevy = { version = "0.19", features = ["asset_processor", "basis-universal", "bevy_settings"] }
# Loads the scenes you author in the editor (assets/*.bsn) and builds # Loads the scenes you author in the editor (assets/*.bsn) and builds
# physics colliders from them. An ordinary dependency; remove it if you # physics colliders from them. An ordinary dependency; remove it if you
# stop using authored scenes. # stop using authored scenes.
@@ -37,3 +42,9 @@ fixed_math = "0.4.1"
# Enable a large amount of optimization in the dev profile for dependencies. # Enable a large amount of optimization in the dev profile for dependencies.
[profile.dev.package."*"] [profile.dev.package."*"]
opt-level = 3 opt-level = 3
[profile.production]
inherits = "release"
lto = "thin"
codegen-units = 1
strip = "symbols"
+18
View File
@@ -13,3 +13,21 @@ cargo run -- --debug-match --players 2 --local-port 7000 \
cargo run -- --debug-match --players 2 --local-port 7001 \ cargo run -- --debug-match --players 2 --local-port 7001 \
--net-player 0=127.0.0.1:7000 --net-player 1=local --net-player 0=127.0.0.1:7000 --net-player 1=local
``` ```
## Production Build
Production builds use the `production` Cargo profile and do not dynamically
link Bevy or Rust. Development builds retain Bevy dynamic linking for faster
iteration. Cargo stores the production profile under `target/production`,
separate from development artifacts under `target/debug`.
```sh
cargo run --locked \
--bin process-assets --no-default-features --features debug_features
cargo build --locked \
--profile production --no-default-features --features debug_features
```
The asset preprocessing command must be run from the repository root. It
populates `imported_assets/Default`, which is then consumed by the production
game without running the asset processor at startup.
+36
View File
@@ -0,0 +1,36 @@
use bevy::{
app::ScheduleRunnerPlugin,
asset::{AssetMode, AssetPlugin, processor::AssetProcessor, processor::ProcessorState},
gltf::GltfPlugin,
image::{CompressedImageFormats, ImageLoader, ImagePlugin},
prelude::*,
tasks::block_on,
text::TextPlugin,
};
use shinespark::AssetProcessingPlugin;
use std::{process::ExitCode, time::Duration};
fn main() -> ExitCode {
let mut app = App::new();
app.add_plugins(MinimalPlugins.set(ScheduleRunnerPlugin::run_loop(Duration::from_millis(50))))
.add_plugins(AssetPlugin {
mode: AssetMode::Processed,
use_asset_processor_override: Some(true),
..default()
})
.add_plugins((ImagePlugin::default(), TextPlugin, GltfPlugin::default()))
.register_asset_loader(ImageLoader::new(CompressedImageFormats::NONE))
.add_plugins(AssetProcessingPlugin)
.add_systems(Update, finish_when_processed);
app.run();
ExitCode::SUCCESS
}
fn finish_when_processed(processor: Option<Res<AssetProcessor>>, mut exit: MessageWriter<AppExit>) {
if processor
.is_some_and(|processor| block_on(processor.get_state()) == ProcessorState::Finished)
{
exit.write(AppExit::Success);
}
}
+11 -2
View File
@@ -151,7 +151,10 @@ type FighterBakeProcessor = LoadTransformAndSave<
>; >;
pub struct BakedAnimationPlugin; pub struct BakedAnimationPlugin;
impl Plugin for BakedAnimationPlugin {
pub struct BakedAnimationAssetProcessingPlugin;
impl Plugin for BakedAnimationAssetProcessingPlugin {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
app.init_asset::<BakedFighterAnimations>() app.init_asset::<BakedFighterAnimations>()
.register_asset_loader(FighterBakeSourceLoader) .register_asset_loader(FighterBakeSourceLoader)
@@ -160,7 +163,13 @@ impl Plugin for BakedAnimationPlugin {
FighterBakeTransformer, FighterBakeTransformer,
BakedFighterAnimationsSaver, BakedFighterAnimationsSaver,
)) ))
.set_default_asset_processor::<FighterBakeProcessor>("fighterbake") .set_default_asset_processor::<FighterBakeProcessor>("fighterbake");
}
}
impl Plugin for BakedAnimationPlugin {
fn build(&self, app: &mut App) {
app.add_plugins(BakedAnimationAssetProcessingPlugin)
.add_systems( .add_systems(
bevy_ggrs::prelude::GgrsSchedule, bevy_ggrs::prelude::GgrsSchedule,
super::runtime::update_fighter_bone_matrices super::runtime::update_fighter_bone_matrices
+1 -1
View File
@@ -4,7 +4,7 @@ mod asset_baking;
mod runtime; mod runtime;
mod visual_binding; mod visual_binding;
pub use asset_baking::BakedAnimationPlugin; pub use asset_baking::{BakedAnimationAssetProcessingPlugin, BakedAnimationPlugin};
pub use crate::math::fixed_transform::FixedMat4; pub use crate::math::fixed_transform::FixedMat4;
pub use runtime::{ pub use runtime::{
BakedAnimationClip, BakedFighterAnimations, FighterBoneIndexMap, FighterBoneMatrices, BakedAnimationClip, BakedFighterAnimations, FighterBoneIndexMap, FighterBoneMatrices,
+39 -5
View File
@@ -32,7 +32,13 @@ use clap::Parser;
use ron_asset_manager::RonAssetPlugin; use ron_asset_manager::RonAssetPlugin;
use crate::{ use crate::{
camera::MatchCameraPlugin, fighter::manifest::FighterManifest, game_settings::GameSettings, schedule::GameplaySchedulePlugin, stage::manifest::StageManifest, ui::InGameUIPlugin, camera::MatchCameraPlugin,
fighter::manifest::FighterManifest,
game_settings::GameSettings,
menus::style::FGUiStyle,
schedule::GameplaySchedulePlugin,
stage::manifest::StageManifest,
ui::InGameUIPlugin,
}; };
mod args; mod args;
@@ -80,6 +86,20 @@ pub enum AppState {
#[derive(Default)] #[derive(Default)]
pub struct GamePlugin; pub struct GamePlugin;
/// Registers every custom asset loader used by the game and asset processor.
pub struct GameAssetPlugin;
impl Plugin for GameAssetPlugin {
fn build(&self, app: &mut App) {
app.add_plugins((
RonAssetPlugin::<FighterManifest>::create("fighter.ron"),
RonAssetPlugin::<StageManifest>::create("stage.ron"),
RonAssetPlugin::<GameSettings>::create("ron"),
RonAssetPlugin::<FGUiStyle>::create("stylesheet.ron"),
));
}
}
impl Plugin for GamePlugin { impl Plugin for GamePlugin {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
// Each module owns its own systems, rollback registrations and // Each module owns its own systems, rollback registrations and
@@ -99,9 +119,7 @@ impl Plugin for GamePlugin {
scripting::importer::FighterScriptImportPlugin, scripting::importer::FighterScriptImportPlugin,
stage::StagePlugin, stage::StagePlugin,
MatchCameraPlugin, MatchCameraPlugin,
RonAssetPlugin::<FighterManifest>::create("fighter.ron"), GameAssetPlugin,
RonAssetPlugin::<StageManifest>::create("stage.ron"),
RonAssetPlugin::<GameSettings>::create("ron"),
InGameUIPlugin, InGameUIPlugin,
)) ))
.add_plugins(menus::MenuPlugin) .add_plugins(menus::MenuPlugin)
@@ -155,11 +173,27 @@ impl Plugin for GamePlugin {
} }
} }
/// Registers the custom asset loaders and processors used by CI and release
/// builds. The processing binary adds this plugin without starting the game.
pub struct AssetProcessingPlugin;
impl Plugin for AssetProcessingPlugin {
fn build(&self, app: &mut App) {
app.add_plugins((
GameAssetPlugin,
scripting::importer::FighterScriptImportPlugin,
fighter::baked_animation::BakedAnimationAssetProcessingPlugin,
));
}
}
fn wait_for_asset_processor( fn wait_for_asset_processor(
processor: Option<Res<AssetProcessor>>, processor: Option<Res<AssetProcessor>>,
mut next_state: ResMut<NextState<AppState>>, mut next_state: ResMut<NextState<AppState>>,
) { ) {
if processor.is_none_or(|processor| block_on(processor.get_state()) == ProcessorState::Finished) if !cfg!(feature = "development")
|| processor
.is_none_or(|processor| block_on(processor.get_state()) == ProcessorState::Finished)
{ {
next_state.set(AppState::LoadCommonAssets); next_state.set(AppState::LoadCommonAssets);
} }
+16 -7
View File
@@ -1,8 +1,11 @@
use bevy::asset::AssetMode::Processed; use bevy::asset::AssetMode::Processed;
#[cfg(feature = "debug_features")]
use bevy::camera_controller::free_camera::FreeCameraPlugin; use bevy::camera_controller::free_camera::FreeCameraPlugin;
use bevy::image::{ImageAddressMode, ImagePlugin, ImageSamplerDescriptor}; use bevy::image::{ImageAddressMode, ImagePlugin, ImageSamplerDescriptor};
use bevy::prelude::*; use bevy::prelude::*;
#[cfg(feature = "debug_features")]
use bevy_egui::EguiPlugin; use bevy_egui::EguiPlugin;
#[cfg(feature = "debug_features")]
use bevy_inspector_egui::quick::WorldInspectorPlugin; use bevy_inspector_egui::quick::WorldInspectorPlugin;
fn main() -> AppExit { fn main() -> AppExit {
@@ -20,16 +23,22 @@ fn main() -> AppExit {
}) })
.set(AssetPlugin { .set(AssetPlugin {
mode: Processed, mode: Processed,
use_asset_processor_override: Some(cfg!(feature = "development")),
..default() ..default()
}); });
App::new() let mut app = App::new();
.add_plugins(default_plugins) app.add_plugins(default_plugins)
.add_plugins(avian3d::prelude::PhysicsPlugins::default()) .add_plugins(avian3d::prelude::PhysicsPlugins::default())
.add_plugins(shinespark::GamePlugin) .add_plugins(shinespark::GamePlugin)
.add_plugins(FreeCameraPlugin) .insert_resource(Time::<Fixed>::from_hz(60.0));
.add_plugins(EguiPlugin::default())
.add_plugins(WorldInspectorPlugin::default()) // adds default options and `InspectorEguiImpl`s #[cfg(feature = "debug_features")]
.insert_resource(Time::<Fixed>::from_hz(60.0)) app.add_plugins((
.run() FreeCameraPlugin,
EguiPlugin::default(),
WorldInspectorPlugin::default(),
));
app.run()
} }
+1 -4
View File
@@ -6,12 +6,10 @@ use bevy::{
prelude::*, prelude::*,
}; };
use ron_asset_manager::RonAssetPlugin;
use crate::{ use crate::{
AppState, AppState,
game_settings::CommonAssets, game_settings::CommonAssets,
menus::{character_select::CharacterSelectScreen, main_menu::MainMenu, style::FGUiStyle}, menus::{character_select::CharacterSelectScreen, main_menu::MainMenu},
}; };
pub mod button; pub mod button;
pub mod character_select; pub mod character_select;
@@ -222,7 +220,6 @@ impl Plugin for MenuPlugin {
//--------- //---------
// STAGE SELECT END // STAGE SELECT END
//--------- //---------
.add_plugins(RonAssetPlugin::<FGUiStyle>::create("stylesheet.ron"))
.add_systems( .add_systems(
Update, Update,
( (