mirror of
https://github.com/rojo-rbx/rojo.git
synced 2026-04-25 07:06:12 +00:00
Fix CI build (hopefully), migrate to using Cargo workspace
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1 +1,4 @@
|
|||||||
/site
|
/site
|
||||||
|
/target
|
||||||
|
/server/scratch
|
||||||
|
**/*.rs.bk
|
||||||
@@ -29,12 +29,10 @@ matrix:
|
|||||||
rust: stable
|
rust: stable
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- cd server
|
|
||||||
- cargo test --verbose
|
- cargo test --verbose
|
||||||
|
|
||||||
- language: rust
|
- language: rust
|
||||||
rust: beta
|
rust: beta
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- cd server
|
|
||||||
- cargo test --verbose
|
- cargo test --verbose
|
||||||
12
server/Cargo.lock → Cargo.lock
generated
12
server/Cargo.lock → Cargo.lock
generated
@@ -1161,9 +1161,10 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "rbx_binary"
|
name = "rbx_binary"
|
||||||
version = "0.1.0"
|
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 = [
|
dependencies = [
|
||||||
"byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
"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)",
|
"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)",
|
"rbx_tree 0.1.0 (git+https://github.com/LPGhatguy/rbx-tree.git)",
|
||||||
]
|
]
|
||||||
@@ -1171,7 +1172,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "rbx_tree"
|
name = "rbx_tree"
|
||||||
version = "0.1.0"
|
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 = [
|
dependencies = [
|
||||||
"serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
|
"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)",
|
"serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
@@ -1181,8 +1182,9 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "rbx_xml"
|
name = "rbx_xml"
|
||||||
version = "0.1.0"
|
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 = [
|
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)",
|
"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)",
|
"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)",
|
"walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rojo-e2e"
|
||||||
|
version = "0.1.0"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rouille"
|
name = "rouille"
|
||||||
version = "2.2.0"
|
version = "2.2.0"
|
||||||
5
Cargo.toml
Normal file
5
Cargo.toml
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
[workspace]
|
||||||
|
members = [
|
||||||
|
"server",
|
||||||
|
"rojo-e2e",
|
||||||
|
]
|
||||||
2
rojo-e2e/.gitignore
vendored
2
rojo-e2e/.gitignore
vendored
@@ -1,2 +0,0 @@
|
|||||||
/target/
|
|
||||||
**/*.rs.bk
|
|
||||||
4
rojo-e2e/Cargo.lock
generated
4
rojo-e2e/Cargo.lock
generated
@@ -1,4 +0,0 @@
|
|||||||
[[package]]
|
|
||||||
name = "rojo-e2e"
|
|
||||||
version = "0.1.0"
|
|
||||||
|
|
||||||
3
server/.gitignore
vendored
3
server/.gitignore
vendored
@@ -1,3 +0,0 @@
|
|||||||
/target/
|
|
||||||
/scratch/
|
|
||||||
**/*.rs.bk
|
|
||||||
@@ -7,6 +7,8 @@ use std::{
|
|||||||
path::{Path, PathBuf},
|
path::{Path, PathBuf},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
use rbx_tree::RbxValue;
|
||||||
|
|
||||||
use librojo::{
|
use librojo::{
|
||||||
project::{Project, ProjectNode, InstanceProjectNode, SyncPointProjectNode},
|
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]
|
#[test]
|
||||||
fn empty() {
|
fn empty() {
|
||||||
let project_file_location = TEST_PROJECTS_ROOT.join("empty/roblox-project.json");
|
let project_file_location = TEST_PROJECTS_ROOT.join("empty/roblox-project.json");
|
||||||
@@ -69,8 +63,21 @@ fn single_sync_point() {
|
|||||||
metadata: Default::default(),
|
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();
|
let mut root_children = HashMap::new();
|
||||||
root_children.insert("ReplicatedStorage".to_string(), replicated_storage);
|
root_children.insert("ReplicatedStorage".to_string(), replicated_storage);
|
||||||
|
root_children.insert("HttpService".to_string(), http_service);
|
||||||
|
|
||||||
let root_node = ProjectNode::Instance(InstanceProjectNode {
|
let root_node = ProjectNode::Instance(InstanceProjectNode {
|
||||||
class_name: "DataModel".to_string(),
|
class_name: "DataModel".to_string(),
|
||||||
|
|||||||
Reference in New Issue
Block a user