Merge branch 'main' into spofford/identity-storage

Author: adamspofford-dfinity

.github/scripts/test-matrix.py

@@ -3,7 +3,7 @@
 
 TEST_DIR = "bin/icp-cli/tests"
 
-MACOS_TESTS = ["hello_tests"]
+MACOS_TESTS = ["network_tests"]
 
 def test_names():
     all_files = os.listdir(TEST_DIR)

.github/workflows/test.yml

@@ -6,6 +6,14 @@ on:
       - main
   pull_request:
 
+env:
+  # When getting Rust dependencies, retry on network error:
+  CARGO_NET_RETRY: 10
+  # Use the local .curlrc
+  CURL_HOME: .
+  # Disable DFX telemetry
+  DFX_TELEMETRY: 'off'
+
 jobs:
   discover:
     runs-on: ubuntu-latest
@@ -38,6 +46,14 @@ jobs:
             target
           key: ${{ matrix.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}-test-1
 
+      - name: Install dfx
+        uses: dfinity/setup-dfx@main
+      - name: Set up path to dfx for tests and to pocketic for icp
+        run: |
+          dfx cache install
+          echo "ICPTEST_DFX_PATH=$(dfx cache show)/dfx" >> "$GITHUB_ENV"
+          echo "ICP_POCKET_IC_PATH=$(dfx cache show)/pocket-ic" >> "$GITHUB_ENV"
+
       - name: Run ${{ matrix.test }}
         run: cargo test --test ${{ matrix.test }}