From 779bcaeccb557cc77ce01f0ba838c5fb31a80619 Mon Sep 17 00:00:00 2001 From: Lucien Greathouse Date: Wed, 9 Jan 2019 16:49:23 -0800 Subject: [PATCH] Fix CI build (hopefully), migrate to using Cargo workspace --- .gitignore | 3 +++ .travis.yml | 2 -- server/Cargo.lock => Cargo.lock | 12 +++++++++--- Cargo.toml | 5 +++++ rojo-e2e/.gitignore | 2 -- rojo-e2e/Cargo.lock | 4 ---- server/.gitignore | 3 --- server/tests/read_projects.rs | 23 +++++++++++++++-------- 8 files changed, 32 insertions(+), 22 deletions(-) rename server/Cargo.lock => Cargo.lock (99%) create mode 100644 Cargo.toml delete mode 100644 rojo-e2e/.gitignore delete mode 100644 rojo-e2e/Cargo.lock delete mode 100644 server/.gitignore diff --git a/.gitignore b/.gitignore index c9490a53..9f64df56 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ /site +/target +/server/scratch +**/*.rs.bk \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 3a12362f..b8ea5d69 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,12 +29,10 @@ matrix: rust: stable script: - - cd server - cargo test --verbose - language: rust rust: beta script: - - cd server - cargo test --verbose \ No newline at end of file diff --git a/server/Cargo.lock b/Cargo.lock similarity index 99% rename from server/Cargo.lock rename to Cargo.lock index b47008b8..56d24a69 100644 --- a/server/Cargo.lock +++ b/Cargo.lock @@ -1161,9 +1161,10 @@ dependencies = [ [[package]] name = "rbx_binary" version = "0.1.0" -source = "git+https://github.com/LPGhatguy/rbx-tree.git#cb68b560bc2c5e922b4b19368ead78f775109065" +source = "git+https://github.com/LPGhatguy/rbx-tree.git#34794a857f8654167b219e229937853388aef822" dependencies = [ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "lz4 1.23.1 (registry+https://github.com/rust-lang/crates.io-index)", "rbx_tree 0.1.0 (git+https://github.com/LPGhatguy/rbx-tree.git)", ] @@ -1171,7 +1172,7 @@ dependencies = [ [[package]] name = "rbx_tree" version = "0.1.0" -source = "git+https://github.com/LPGhatguy/rbx-tree.git#cb68b560bc2c5e922b4b19368ead78f775109065" +source = "git+https://github.com/LPGhatguy/rbx-tree.git#34794a857f8654167b219e229937853388aef822" dependencies = [ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1181,8 +1182,9 @@ dependencies = [ [[package]] name = "rbx_xml" version = "0.1.0" -source = "git+https://github.com/LPGhatguy/rbx-tree.git#cb68b560bc2c5e922b4b19368ead78f775109065" +source = "git+https://github.com/LPGhatguy/rbx-tree.git#34794a857f8654167b219e229937853388aef822" dependencies = [ + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "rbx_tree 0.1.0 (git+https://github.com/LPGhatguy/rbx-tree.git)", "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1301,6 +1303,10 @@ dependencies = [ "walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "rojo-e2e" +version = "0.1.0" + [[package]] name = "rouille" version = "2.2.0" diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 00000000..27dc248a --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,5 @@ +[workspace] +members = [ + "server", + "rojo-e2e", +] \ No newline at end of file diff --git a/rojo-e2e/.gitignore b/rojo-e2e/.gitignore deleted file mode 100644 index a79a8002..00000000 --- a/rojo-e2e/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/target/ -**/*.rs.bk \ No newline at end of file diff --git a/rojo-e2e/Cargo.lock b/rojo-e2e/Cargo.lock deleted file mode 100644 index 0b6ac389..00000000 --- a/rojo-e2e/Cargo.lock +++ /dev/null @@ -1,4 +0,0 @@ -[[package]] -name = "rojo-e2e" -version = "0.1.0" - diff --git a/server/.gitignore b/server/.gitignore deleted file mode 100644 index 9b55d532..00000000 --- a/server/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target/ -/scratch/ -**/*.rs.bk diff --git a/server/tests/read_projects.rs b/server/tests/read_projects.rs index 239016c2..af30ed99 100644 --- a/server/tests/read_projects.rs +++ b/server/tests/read_projects.rs @@ -7,6 +7,8 @@ use std::{ path::{Path, PathBuf}, }; +use rbx_tree::RbxValue; + use librojo::{ project::{Project, ProjectNode, InstanceProjectNode, SyncPointProjectNode}, }; @@ -17,14 +19,6 @@ lazy_static! { }; } -#[test] -fn tour_de_force() { - let project_file_location = TEST_PROJECTS_ROOT.join("example.json"); - let project = Project::load_exact(&project_file_location).unwrap(); - - assert_eq!(project.name, "example"); -} - #[test] fn empty() { let project_file_location = TEST_PROJECTS_ROOT.join("empty/roblox-project.json"); @@ -69,8 +63,21 @@ fn single_sync_point() { metadata: Default::default(), }); + let mut http_service_properties = HashMap::new(); + http_service_properties.insert("HttpEnabled".to_string(), RbxValue::Bool { + value: true, + }); + + let http_service = ProjectNode::Instance(InstanceProjectNode { + class_name: "HttpService".to_string(), + children: HashMap::new(), + properties: http_service_properties, + metadata: Default::default(), + }); + let mut root_children = HashMap::new(); root_children.insert("ReplicatedStorage".to_string(), replicated_storage); + root_children.insert("HttpService".to_string(), http_service); let root_node = ProjectNode::Instance(InstanceProjectNode { class_name: "DataModel".to_string(),