Use cargo workspaces for our multiple crates

SpaceTeam · Aug 4, 2024 · b3dc4a7 · b3dc4a7
1 parent b5f670b
commit b3dc4a7
Show file tree

Hide file tree

Showing 47 changed files with 53 additions and 44 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -32,6 +32,8 @@ jobs:
         cross build --examples --bins --release --target aarch64-unknown-linux-gnu
         mv target/aarch64-unknown-linux-gnu/release/STS1_EDU_Scheduler .
         mv target/aarch64-unknown-linux-gnu/release/examples/cli .
+        cp scheduler/config.toml .
+        cp scheduler/scheduler.service .
     - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:

diff --git a/.gitignore b/.gitignore
@@ -4,11 +4,11 @@ __pycache__/
 venv
 .vscode
 log
-archives/
-data/
+archives/*
+data/*
 tests/tmp/
 lib/**/target
 
 # Added by cargo
 
-/target
+/target
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,35 +1,11 @@
-[package]
-name = "STS1_EDU_Scheduler"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-log = "0.4.22"
-simplelog = "0.12.2"
-subprocess = "0.2.9"
-crc = "3.2.1"
-toml = "0.8.19"
-rppal = "0.18.0"
-serde = { version = "1.0.204", features = ["derive"] }
-strum = { version = "0.26.3", features = ["derive"] }
-serialport = "4.4.0"
-test-case = "3.3.1"
-tar = "0.4.41"
-thiserror = "1.0.63"
-anyhow = { version = "1.0.86", features = ["backtrace"] }
-
-[dependencies.filevec]
-path = "lib/filevec"
-
-[features]
-mock = []
-rpi = []
-
-[dev-dependencies]
-file-per-thread-logger = "0.2.0"
-inquire = "0.7.5"
-
-[lints.clippy]
+[workspace]
+resolver = "2"
+members = [
+    "scheduler",
+    "filevec",
+]
+
+[workspace.lints.clippy]
 pedantic = { level = "warn", priority = -1 }
 missing_errors_doc = "allow"
 module_name_repetitions = "allow"

diff --git a/Makefile b/Makefile
@@ -16,11 +16,11 @@ packs:
 
 clean:
 	rm -rf *.profraw
-	rm -f ThreadId* updatepin
-	rm -f data/*
-	rm -rf archives/*
-	rm -rf tests/tmp
-	rm -f tests/*.pack
+	rm -f scheduler/ThreadId* scheduler/updatepin
+	rm -f scheduler/data/*
+	rm -rf scheduler/archives/*
+	rm -rf scheduler/tests/tmp
+	rm -f scheduler/tests/*.pack
 
 rebuild_student_archive:
 	rm -f tests/student_program.zip

diff --git a/archives/.gitkeep b/archives/.gitkeep
@@ -1,2 +0,0 @@
-Folder for storing student programs
-Used by tests

diff --git a/lib/filevec/Cargo.lock → filevec/Cargo.lock b/lib/filevec/Cargo.lock → filevec/Cargo.lock
diff --git a/lib/filevec/Cargo.toml → filevec/Cargo.toml b/lib/filevec/Cargo.toml → filevec/Cargo.toml
diff --git a/lib/filevec/src/lib.rs → filevec/src/lib.rs b/lib/filevec/src/lib.rs → filevec/src/lib.rs
diff --git a/scheduler/Cargo.toml b/scheduler/Cargo.toml
@@ -0,0 +1,33 @@
+[package]
+name = "STS1_EDU_Scheduler"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+log = "0.4.22"
+simplelog = "0.12.2"
+subprocess = "0.2.9"
+crc = "3.2.1"
+toml = "0.8.19"
+rppal = "0.18.0"
+serde = { version = "1.0.204", features = ["derive"] }
+strum = { version = "0.26.3", features = ["derive"] }
+serialport = "4.4.0"
+test-case = "3.3.1"
+tar = "0.4.41"
+thiserror = "1.0.63"
+anyhow = { version = "1.0.86", features = ["backtrace"] }
+
+[dependencies.filevec]
+path = "../filevec"
+
+[features]
+mock = []
+rpi = []
+
+[dev-dependencies]
+file-per-thread-logger = "0.2.0"
+inquire = "0.7.5"
+
+[lints]
+workspace = true
diff --git a/config.toml → scheduler/config.toml b/config.toml → scheduler/config.toml
diff --git a/docs/protocol.py → scheduler/docs/protocol.py b/docs/protocol.py → scheduler/docs/protocol.py
diff --git a/examples/cli.rs → scheduler/examples/cli.rs b/examples/cli.rs → scheduler/examples/cli.rs
diff --git a/scheduler.service → scheduler/scheduler.service b/scheduler.service → scheduler/scheduler.service
diff --git a/src/command/common.rs → scheduler/src/command/common.rs b/src/command/common.rs → scheduler/src/command/common.rs
diff --git a/src/command/error.rs → scheduler/src/command/error.rs b/src/command/error.rs → scheduler/src/command/error.rs
diff --git a/src/command/execute_program.rs → scheduler/src/command/execute_program.rs b/src/command/execute_program.rs → scheduler/src/command/execute_program.rs
diff --git a/src/command/execution_context.rs → scheduler/src/command/execution_context.rs b/src/command/execution_context.rs → scheduler/src/command/execution_context.rs
diff --git a/src/command/get_status.rs → scheduler/src/command/get_status.rs b/src/command/get_status.rs → scheduler/src/command/get_status.rs
diff --git a/src/command/mod.rs → scheduler/src/command/mod.rs b/src/command/mod.rs → scheduler/src/command/mod.rs
diff --git a/src/command/return_result.rs → scheduler/src/command/return_result.rs b/src/command/return_result.rs → scheduler/src/command/return_result.rs
diff --git a/src/command/stop_program.rs → scheduler/src/command/stop_program.rs b/src/command/stop_program.rs → scheduler/src/command/stop_program.rs
diff --git a/src/command/store_archive.rs → scheduler/src/command/store_archive.rs b/src/command/store_archive.rs → scheduler/src/command/store_archive.rs
diff --git a/src/command/update_time.rs → scheduler/src/command/update_time.rs b/src/command/update_time.rs → scheduler/src/command/update_time.rs
diff --git a/src/communication/cep.rs → scheduler/src/communication/cep.rs b/src/communication/cep.rs → scheduler/src/communication/cep.rs
diff --git a/src/communication/mod.rs → scheduler/src/communication/mod.rs b/src/communication/mod.rs → scheduler/src/communication/mod.rs
diff --git a/src/communication/socket.rs → scheduler/src/communication/socket.rs b/src/communication/socket.rs → scheduler/src/communication/socket.rs
diff --git a/src/lib.rs → scheduler/src/lib.rs b/src/lib.rs → scheduler/src/lib.rs
diff --git a/src/main.rs → scheduler/src/main.rs b/src/main.rs → scheduler/src/main.rs
diff --git a/tests/simulation/command_execution.rs → ...ler/tests/simulation/command_execution.rs b/tests/simulation/command_execution.rs → ...ler/tests/simulation/command_execution.rs
diff --git a/tests/simulation/full_run.rs → scheduler/tests/simulation/full_run.rs b/tests/simulation/full_run.rs → scheduler/tests/simulation/full_run.rs
diff --git a/tests/simulation/logging.rs → scheduler/tests/simulation/logging.rs b/tests/simulation/logging.rs → scheduler/tests/simulation/logging.rs
diff --git a/tests/simulation/mod.rs → scheduler/tests/simulation/mod.rs b/tests/simulation/mod.rs → scheduler/tests/simulation/mod.rs
@@ -92,7 +92,7 @@ fn start_scheduler(
     std::io::Error,
 > {
     let test_dir = format!("./tests/tmp/{unique}");
-    let scheduler_bin = std::fs::canonicalize("./target/release/STS1_EDU_Scheduler")?;
+    let scheduler_bin = std::fs::canonicalize("../target/release/STS1_EDU_Scheduler")?;
     let _ = std::fs::remove_dir_all(&test_dir);
     std::fs::create_dir_all(&test_dir)?;
     std::fs::write(format!("{}/config.toml", &test_dir), get_config_str(unique))?;

diff --git a/tests/simulation/socket.rs → scheduler/tests/simulation/socket.rs b/tests/simulation/socket.rs → scheduler/tests/simulation/socket.rs
diff --git a/tests/simulation/timeout.rs → scheduler/tests/simulation/timeout.rs b/tests/simulation/timeout.rs → scheduler/tests/simulation/timeout.rs
diff --git a/tests/software_tests/command_integration.rs → ...sts/software_tests/command_integration.rs b/tests/software_tests/command_integration.rs → ...sts/software_tests/command_integration.rs
diff --git a/tests/software_tests/common.rs → scheduler/tests/software_tests/common.rs b/tests/software_tests/common.rs → scheduler/tests/software_tests/common.rs
@@ -109,7 +109,7 @@ impl Write for TestCom {
 /// Copy the mockup student program from `tests/test_data/main.py` into `archives/{path}`. This absolves the need
 /// to include an extra `store_archive` command.
 pub fn prepare_program(path: &str) {
-    let ret = std::fs::create_dir(format!("./archives/{path}"));
+    let ret = std::fs::create_dir_all(format!("./archives/{path}"));
     if let Err(e) = ret {
         assert!(e.kind() == std::io::ErrorKind::AlreadyExists, "Setup Error: {e}");
     }

diff --git a/tests/software_tests/communication_tests.rs → ...sts/software_tests/communication_tests.rs b/tests/software_tests/communication_tests.rs → ...sts/software_tests/communication_tests.rs
diff --git a/tests/software_tests/execute_program.rs → ...r/tests/software_tests/execute_program.rs b/tests/software_tests/execute_program.rs → ...r/tests/software_tests/execute_program.rs
diff --git a/tests/software_tests/get_status.rs → scheduler/tests/software_tests/get_status.rs b/tests/software_tests/get_status.rs → scheduler/tests/software_tests/get_status.rs
diff --git a/tests/software_tests/mod.rs → scheduler/tests/software_tests/mod.rs b/tests/software_tests/mod.rs → scheduler/tests/software_tests/mod.rs
diff --git a/tests/software_tests/return_result.rs → ...ler/tests/software_tests/return_result.rs b/tests/software_tests/return_result.rs → ...ler/tests/software_tests/return_result.rs
diff --git a/tests/software_tests/stop_program.rs → ...uler/tests/software_tests/stop_program.rs b/tests/software_tests/stop_program.rs → ...uler/tests/software_tests/stop_program.rs
diff --git a/tests/software_tests/store_archive.rs → ...ler/tests/software_tests/store_archive.rs b/tests/software_tests/store_archive.rs → ...ler/tests/software_tests/store_archive.rs
diff --git a/tests/student_program.zip → scheduler/tests/student_program.zip b/tests/student_program.zip → scheduler/tests/student_program.zip
diff --git a/tests/test_data/main.py → scheduler/tests/test_data/main.py b/tests/test_data/main.py → scheduler/tests/test_data/main.py
diff --git a/tests/test_data/module0/__init__.py → ...duler/tests/test_data/module0/__init__.py b/tests/test_data/module0/__init__.py → ...duler/tests/test_data/module0/__init__.py
diff --git a/tests/tests.rs → scheduler/tests/tests.rs b/tests/tests.rs → scheduler/tests/tests.rs
Original file line number	Diff line number	Diff line change
		@@ -1,2 +0,0 @@
		Folder for storing student programs
		Used by tests