Skip to content

Commit

Permalink
ci: add libwayland
Browse files Browse the repository at this point in the history
  • Loading branch information
cilki committed Jul 25, 2024
1 parent de05c7c commit 3c929b3
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ jobs:
- x86_64-unknown-linux-gnu
- x86_64-unknown-linux-musl
steps:
- run: sudo apt-get install -y libwayland-dev

- uses: actions/checkout@v4
with:
fetch-tags: true
Expand Down Expand Up @@ -53,6 +55,7 @@ jobs:
GH_TOKEN: ${{ github.token }}

- name: Build apk
working-directory: sandpolis-client-mobile
run: |
x doctor
x build
Expand Down
5 changes: 3 additions & 2 deletions sandpolis/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ sysinfo = { version = "0.30.13", optional = true }
dialoguer = { version = "0.11.0", optional = true }

[features]
server = [ "dep:axum", "dep:axum-server", "dep:axum-macros" ]
server = [ "dep:axum", "dep:axum-server", "dep:axum-macros", "local-database" ]
agent = [ "dep:sysinfo", "dep:dialoguer" ]
probe = [ "agent" ]
client = [ "dep:bevy", "dep:bevy_rapier2d", "dep:bevy_egui", "dep:egui" ]
Expand All @@ -57,4 +57,5 @@ layer-account = []
layer-logging = []
layer-meta = []

default = [ "layer-desktop", "layer-filesystem", "layer-shell", "layer-inventory", "layer-account", "layer-logging", "layer-meta" ]
default = [ "local-database", "layer-desktop", "layer-filesystem", "layer-shell", "layer-inventory", "layer-account", "layer-logging", "layer-meta" ]
local-database = []
1 change: 1 addition & 0 deletions sandpolis/src/client/ui/input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ pub fn handle_layer_change(
.resizable(false)
.movable(false)
.collapsible(false)
.title_bar(false)
.fixed_pos(egui::Pos2::new(window_size.x / 2.0, window_size.y - 30.0))
.show(contexts.ctx_mut(), |ui| {
ui.label(format!("{:?}", **current_layer));
Expand Down
3 changes: 2 additions & 1 deletion sandpolis/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use anyhow::bail;
use anyhow::Result;
use clap::Parser;
use futures::Future;
Expand Down Expand Up @@ -37,5 +38,5 @@ async fn main() -> Result<ExitCode> {
#[cfg(feature = "agent")]
tokio::join!(agent_thread).0??;

bail!("No instance was enabled at build time");
bail!("No instance was enabled at build time")
}

0 comments on commit 3c929b3

Please sign in to comment.