Merge branch 'merge'

maidsafe · Feb 27, 2025 · 267495e · 267495e
2 parents 76522c4 + 0e6199a
commit 267495e
Show file tree

Hide file tree

Showing 65 changed files with 1,580 additions and 728 deletions.
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -152,13 +152,17 @@ jobs:
         timeout-minutes: 5
         run: cargo test --release --package ant-networking --features="open-metrics" can_store_after_restart
 
-      - name: Run network tests
-        timeout-minutes: 25
-        run: cargo test --release --package ant-networking --features="open-metrics" -- --skip can_store_after_restart
-
-      - name: Run network tests
-        timeout-minutes: 5
-        run: cargo test --release --package ant-networking --features="open-metrics" can_store_after_restart
+      # Same set of tests shall be executed with `encrypt-records` flag enabled.
+      # With now changed to `always carry out encryption`, no need to re-run the same set again.
+      # Re-enable the following block once default behaviour changed.
+      #
+      # - name: Run network tests
+      #   timeout-minutes: 25
+      #   run: cargo test --release --package ant-networking --features="open-metrics, encrypt-records" -- --skip can_store_after_restart
+
+      # - name: Run network tests
+      #   timeout-minutes: 5
+      #   run: cargo test --release --package ant-networking --features="open-metrics, encrypt-records" can_store_after_restart
 
       - name: Run protocol tests
         timeout-minutes: 25

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ant-bootstrap/Cargo.toml b/ant-bootstrap/Cargo.toml
@@ -7,11 +7,11 @@ license = "GPL-3.0"
 name = "ant-bootstrap"
 readme = "README.md"
 repository = "https://github.com/maidsafe/autonomi"
-version = "0.1.5"
+version = "0.1.6-rc.3"
 
 [dependencies]
-ant-logging = { path = "../ant-logging", version = "0.2.46" }
-ant-protocol = { path = "../ant-protocol", version = "1.0.0" }
+ant-logging = { path = "../ant-logging", version = "0.2.47-rc.3" }
+ant-protocol = { path = "../ant-protocol", version = "1.0.1-rc.3" }
 atomic-write-file = "0.2.2"
 chrono = { version = "0.4", features = ["serde"] }
 clap = { version = "4.2.1", features = ["derive", "env"] }

diff --git a/ant-build-info/Cargo.toml b/ant-build-info/Cargo.toml
@@ -7,7 +7,7 @@ license = "GPL-3.0"
 name = "ant-build-info"
 readme = "README.md"
 repository = "https://github.com/maidsafe/autonomi"
-version = "0.1.24"
+version = "0.1.25-rc.3"
 build = "build.rs"
 include = ["Cargo.toml", "src/**/*", "build.rs"]
 

diff --git a/ant-build-info/src/release_info.rs b/ant-build-info/src/release_info.rs
@@ -1,4 +1,4 @@
 pub const RELEASE_YEAR: &str = "2025";
 pub const RELEASE_MONTH: &str = "1";
 pub const RELEASE_CYCLE: &str = "2";
-pub const RELEASE_CYCLE_COUNTER: &str = "3";
+pub const RELEASE_CYCLE_COUNTER: &str = "6";