From 91b0247e688495b8d7f5d897cc4a7dc8811220da Mon Sep 17 00:00:00 2001 From: despiegk Date: Sun, 15 Jun 2025 16:21:07 +0200 Subject: [PATCH] Update git remote URL from git.ourworld.tf to git.threefold.info --- README.md | 2 +- doctree/Cargo.toml | 2 +- examples/doctreenew/sites/demo1/collection.hjson | 8 ++++---- webbuilder/Cargo.toml | 2 +- webbuilder/src/builder/mod_test.rs | 2 +- webbuilder/src/builder/specs.md | 2 +- webbuilder/src/config_test.rs | 2 +- webbuilder/src/git_test.rs | 2 +- webbuilder/src/parser_test.rs | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 62fed33..a5b2bcd 100644 --- a/README.md +++ b/README.md @@ -211,7 +211,7 @@ Add doctree to your Cargo.toml: ```toml [dependencies] -doctree = { git = "https://git.ourworld.tf/herocode/doctree", branch = "main", package = "doctree", path = "doctree/src" } +doctree = { git = "https://git.threefold.info/herocode/doctree", branch = "main", package = "doctree", path = "doctree/src" } ``` Basic usage: diff --git a/doctree/Cargo.toml b/doctree/Cargo.toml index 7e5adf4..79eaa56 100644 --- a/doctree/Cargo.toml +++ b/doctree/Cargo.toml @@ -15,7 +15,7 @@ toml = "0.7.3" serde = { version = "1.0", features = ["derive"] } redis = { version = "0.23.0", features = ["tokio-comp"] } tokio = { version = "1.28.0", features = ["full"] } -sal = { git = "https://git.ourworld.tf/herocode/sal.git" } +sal = { git = "https://git.threefold.info/herocode/sal.git" } chacha20poly1305 = "0.10.1" blake3 = "1.3.1" csv = "1.1" diff --git a/examples/doctreenew/sites/demo1/collection.hjson b/examples/doctreenew/sites/demo1/collection.hjson index af8d414..17449a0 100644 --- a/examples/doctreenew/sites/demo1/collection.hjson +++ b/examples/doctreenew/sites/demo1/collection.hjson @@ -2,23 +2,23 @@ { name: docs_hero #existing docusaurus site can be used as collection as long as no duplicates - url: https://git.ourworld.tf/tfgrid/docs_tfgrid4/src/branch/main/aibox/docs + url: https://git.threefold.info/tfgrid/docs_tfgrid4/src/branch/main/aibox/docs description: Documentation for the ThreeFold Hero project. } { name: biz - url: https://git.ourworld.tf/tfgrid/docs_tfgrid4/src/branch/main/aibox/collections/aaa + url: https://git.threefold.info/tfgrid/docs_tfgrid4/src/branch/main/aibox/collections/aaa description: Business documentation. } { name: products - url: https://git.ourworld.tf/tfgrid/docs_tfgrid4/src/branch/main/aibox/collections/vvv + url: https://git.threefold.info/tfgrid/docs_tfgrid4/src/branch/main/aibox/collections/vvv description: Information about ThreeFold products. } { scan: true - url: https://git.ourworld.tf/tfgrid/docs_tfgrid4/src/branch/main/aibox/collections + url: https://git.threefold.info/tfgrid/docs_tfgrid4/src/branch/main/aibox/collections } ] diff --git a/webbuilder/Cargo.toml b/webbuilder/Cargo.toml index bbf22a4..3323f6d 100644 --- a/webbuilder/Cargo.toml +++ b/webbuilder/Cargo.toml @@ -24,7 +24,7 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" redis = { version = "0.23.0", features = ["tokio-comp"] } tokio = { version = "1.28.0", features = ["full"] } -sal = { git = "https://git.ourworld.tf/herocode/sal.git" } +sal = { git = "https://git.threefold.info/herocode/sal.git" } # Hjson parsing deser-hjson = "1.1.0" diff --git a/webbuilder/src/builder/mod_test.rs b/webbuilder/src/builder/mod_test.rs index 1e73899..0f76161 100644 --- a/webbuilder/src/builder/mod_test.rs +++ b/webbuilder/src/builder/mod_test.rs @@ -20,7 +20,7 @@ mod tests { footer: None, collections: vec![CollectionConfig { name: Some("test".to_string()), - url: Some("https://git.ourworld.tf/tfgrid/home.git".to_string()), + url: Some("https://git.threefold.info/tfgrid/home.git".to_string()), description: Some("A test collection".to_string()), scan: Some(true), }], diff --git a/webbuilder/src/builder/specs.md b/webbuilder/src/builder/specs.md index 89735f0..1cd22bf 100644 --- a/webbuilder/src/builder/specs.md +++ b/webbuilder/src/builder/specs.md @@ -4,7 +4,7 @@ This document describes the process of building web metadata and exporting asset ## Overview -The web building process starts with a directory containing the site's Hjson configuration files, such as the example directory `/Users/despiegk/code/git.ourworld.tf/herocode/doctree/examples/doctreenew/sites/demo1`. These Hjson files define the structure and content of the entire site and may reference external collections. The Hjson configuration sits "on top" of the collections it utilizes. Using the metadata defined in these Hjson files, the necessary collection data is downloaded from Git repositories (if referenced). The `doctree` is then used to process the relevant data, identify pages and images, and prepare them for export to IPFS. Finally, a `webmeta.json` file is generated containing all the necessary information, including IPFS keys and Blake hashes for content verification, allowing a browser-based tool to render the website by fetching assets from IPFS. Optionally, the generated `webmeta.json` file can also be uploaded to IPFS, and its IPFS URL returned. +The web building process starts with a directory containing the site's Hjson configuration files, such as the example directory `/Users/despiegk/code/git.threefold.info/herocode/doctree/examples/doctreenew/sites/demo1`. These Hjson files define the structure and content of the entire site and may reference external collections. The Hjson configuration sits "on top" of the collections it utilizes. Using the metadata defined in these Hjson files, the necessary collection data is downloaded from Git repositories (if referenced). The `doctree` is then used to process the relevant data, identify pages and images, and prepare them for export to IPFS. Finally, a `webmeta.json` file is generated containing all the necessary information, including IPFS keys and Blake hashes for content verification, allowing a browser-based tool to render the website by fetching assets from IPFS. Optionally, the generated `webmeta.json` file can also be uploaded to IPFS, and its IPFS URL returned. ## Process Steps diff --git a/webbuilder/src/config_test.rs b/webbuilder/src/config_test.rs index 0ee8c05..87819b4 100644 --- a/webbuilder/src/config_test.rs +++ b/webbuilder/src/config_test.rs @@ -62,7 +62,7 @@ mod tests { }), collections: vec![CollectionConfig { name: Some("test".to_string()), - url: Some("https://git.ourworld.tf/tfgrid/home.git".to_string()), + url: Some("https://git.threefold.info/tfgrid/home.git".to_string()), description: Some("A test collection".to_string()), scan: Some(true), }], diff --git a/webbuilder/src/git_test.rs b/webbuilder/src/git_test.rs index a5c3ab6..c78b8ce 100644 --- a/webbuilder/src/git_test.rs +++ b/webbuilder/src/git_test.rs @@ -8,7 +8,7 @@ mod tests { fn test_clone_repository_error_invalid_destination() { // Test with a destination that has no parent directory // This URL is invalid because we added number 2 after `home` - let result = clone_repository("https://git.ourworld.tf/tfgrid/home2.git", PathBuf::from("/")); + let result = clone_repository("https://git.threefold.info/tfgrid/home2.git", PathBuf::from("/")); assert!(result.is_err()); assert!(matches!( diff --git a/webbuilder/src/parser_test.rs b/webbuilder/src/parser_test.rs index 43f81f0..6b5764c 100644 --- a/webbuilder/src/parser_test.rs +++ b/webbuilder/src/parser_test.rs @@ -52,7 +52,7 @@ mod tests { { # First collection "name": "test", - "url": "https://git.ourworld.tf/tfgrid/home.git", + "url": "https://git.threefold.info/tfgrid/home.git", "description": "A test collection", "scan": true }, @@ -132,7 +132,7 @@ mod tests { assert_eq!(config.collections[0].name, Some("test".to_string())); assert_eq!( config.collections[0].url, - Some("https://git.ourworld.tf/tfgrid/home.git".to_string()) + Some("https://git.threefold.info/tfgrid/home.git".to_string()) ); assert_eq!( config.collections[0].description,