Skip to content

Commit ff6b22a

Browse files
committed
wip: begin package layer
1 parent 72feb0a commit ff6b22a

File tree

15 files changed

+150
-167
lines changed

15 files changed

+150
-167
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
- uses: actions/upload-artifact@v4
3737
with:
38-
name: build_artifacts
38+
name: linux_artifacts
3939
path: target/${{ matrix.target }}/debug/sandpolis
4040

4141
android:
@@ -66,12 +66,10 @@ jobs:
6666
working-directory: sandpolis-client-mobile
6767
run: |
6868
x doctor
69-
x build --arch arm64 --platform android --format apk
70-
cd ..
71-
tree -L 5 target
69+
x build --release --arch arm64 --platform android --format apk
7270
7371
- uses: actions/upload-artifact@v4
7472
with:
75-
name: build_artifacts
73+
name: android_artifacts
7674
path: target/x/debug/android/*.apk
7775

Cargo.lock

Lines changed: 33 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugin/sandpolis-plugin-update/agent/src/main/java/org/s7s/plugin/update/agent/java/UpdateExe.java

Lines changed: 0 additions & 30 deletions
This file was deleted.

plugin/sandpolis-plugin-update/state.json

Lines changed: 0 additions & 93 deletions
This file was deleted.

sandpolis/Cargo.toml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,13 @@ tokio = { version = "1.34.0", default-features = false, features = ["rt", "macro
2626
tracing = "0.1.40"
2727
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
2828
uuid = { version = "1.10.0", features = ["v7", "serde"] }
29+
dialoguer = { version = "0.11.0" }
2930

3031
# Server dependencies
3132
axum-macros = { version = "0.4.1", optional = true }
3233
axum-server = { version = "0.6.0", features = ["tls-rustls"], optional = true }
3334
axum = { version = "0.7.4", optional = true }
35+
rcgen = { version = "0.13.1", optional = true }
3436

3537
# Client dependencies
3638
bevy = { version = "0.14.0", optional = true }
@@ -40,23 +42,25 @@ egui = { version = "0.28", optional = true }
4042

4143
# Agent dependencies
4244
sysinfo = { version = "0.30.13", optional = true }
43-
dialoguer = { version = "0.11.0", optional = true }
4445

4546
[features]
46-
server = [ "dep:axum", "dep:axum-server", "dep:axum-macros", "local-database" ]
47-
agent = [ "dep:sysinfo", "dep:dialoguer" ]
47+
server = [ "dep:axum", "dep:axum-server", "dep:axum-macros", "dep:rcgen", "local-database" ]
48+
agent = [ "dep:sysinfo" ]
4849
probe = [ "agent" ]
4950
client = [ "dep:bevy", "dep:bevy_rapier2d", "dep:bevy_egui", "dep:egui" ]
5051

5152
# Layers
53+
layer-account = []
54+
layer-alerts = []
5255
layer-desktop = []
5356
layer-filesystem = []
54-
layer-shell = []
57+
layer-health = []
5558
layer-inventory = []
56-
layer-account = []
5759
layer-logging = []
58-
layer-meta = []
60+
layer-packages = []
61+
layer-shell = []
5962

60-
default = [ "local-database", "layer-desktop", "layer-filesystem", "layer-shell", "layer-inventory", "layer-account", "layer-logging", "layer-meta" ]
63+
default = [ "local-database", "layer-desktop", "layer-filesystem", "layer-shell", "layer-inventory", "layer-account", "layer-logging" ]
6164
local-database = []
6265
wayland = [ "bevy/wayland" ]
66+
rcgen = ["dep:rcgen"]

sandpolis/src/agent/layer/package/mod.rs

Whitespace-only changes.
File renamed without changes.

sandpolis/src/api/layer/update.rs

Lines changed: 0 additions & 24 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)