Merge branch 'main' into use-default-nodes-dir-root-primary-mt-pt

maidsafe · Jan 2, 2025 · 0fbe822 · 0fbe822
2 parents 1637d5a + 0888f97
commit 0fbe822
Show file tree

Hide file tree

Showing 46 changed files with 77 additions and 1,658 deletions.
diff --git a/.github/workflows/cross-platform.yml b/.github/workflows/cross-platform.yml
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -148,19 +148,19 @@ jobs:
       # This is most likely due to the setup and cocurrency issues of the tests.
       # As the `record_store` is used in a single thread style, get the test passing executed
       # and passing standalone is enough.
-      - name: Run network tests (with encrypt-records)
+      - name: Run network tests
         timeout-minutes: 25
-        run: cargo test --release --package ant-networking --features="open-metrics, encrypt-records" -- --skip can_store_after_restart
+        run: cargo test --release --package ant-networking --features="open-metrics" -- --skip can_store_after_restart
 
-      - name: Run network tests (with encrypt-records)
+      - name: Run network tests
         timeout-minutes: 5
-        run: cargo test --release --package ant-networking --features="open-metrics, encrypt-records" can_store_after_restart
+        run: cargo test --release --package ant-networking --features="open-metrics" can_store_after_restart
 
-      - name: Run network tests (without encrypt-records)
+      - 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 (without encrypt-records)
+      - name: Run network tests
         timeout-minutes: 5
         run: cargo test --release --package ant-networking --features="open-metrics" can_store_after_restart
 

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -262,7 +262,7 @@ jobs:
 
       - name: Run network tests
         timeout-minutes: 25
-        run: cargo test --release --package ant-networking --features="open-metrics, encrypt-records"
+        run: cargo test --release --package ant-networking --features="open-metrics"
 
       - name: Run protocol tests
         timeout-minutes: 25