From 220f1a1833f301a33264c96fdc8abf48b79b2dee Mon Sep 17 00:00:00 2001
From: Grant Limberg <grant.limberg@zerotier.com>
Date: Mon, 1 May 2023 15:57:48 -0700
Subject: [PATCH] Caching should now work

---
 .github/workflows/build.yml    | 32 +++---------
 .github/workflows/validate.yml | 94 ++++++++++++++++------------------
 2 files changed, 50 insertions(+), 76 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 981e22f2c..7d3de01e6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,14 +24,6 @@ jobs:
       with:
         workspaces: |
           zeroidc/
-        # path: |
-        #   ~/.cargo/bin/
-        #   ~/.cargo/registry/index/
-        #   ~/.cargo/registry/cache/
-        #   ~/.cargo/git/db/
-        #   ./zeroidc/target/
-        key: ${{ runner.os }}-cargo-${{ hashFiles('zeroidc//Cargo.lock') }}
-        restore-keys: ${{ runner.os }}-cargo-
     - name: make
       run: make
     - name: selftest
@@ -56,17 +48,11 @@ jobs:
         override: true
         components: rustfmt, clippy
     - name: Set up cargo cache
-      uses: actions/cache@v3
+      uses: Swatinem/rust-cache@v2
       continue-on-error: false
       with:
-        path: |
-          ~/.cargo/bin/
-          ~/.cargo/registry/index/
-          ~/.cargo/registry/cache/
-          ~/.cargo/git/db/
-          target/
-        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-        restore-keys: ${{ runner.os }}-cargo-
+        workspaces: |
+          zeroidc/
     - name: make
       run: make
     - name: selftest
@@ -91,17 +77,11 @@ jobs:
         override: true
         components: rustfmt, clippy
     - name: Set up cargo cache
-      uses: actions/cache@v3
+      uses: Swatinem/rust-cache@v2
       continue-on-error: false
       with:
-        path: |
-          ~/.cargo/bin/
-          ~/.cargo/registry/index/
-          ~/.cargo/registry/cache/
-          ~/.cargo/git/db/
-          target/
-        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-        restore-keys: ${{ runner.os }}-cargo-
+        workspaces: |
+          zeroidc/
     - name: setup msbuild
       uses: microsoft/setup-msbuild@v1.1.3
     - name: msbuild
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index f6621c8aa..4a07243aa 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -1,57 +1,51 @@
-# on: [ push ]
+on: [ push ]
 
-# jobs:
-#   build_ubuntu:
-#     runs-on: ubuntu-latest
-#     steps:
-#     - name: gitconfig
-#       run: |
-#         git config --global core.autocrlf input
+jobs:
+  build_ubuntu:
+    runs-on: ubuntu-latest
+    steps:
+    - name: gitconfig
+      run: |
+        git config --global core.autocrlf input
 
-#     - name: checkout
-#       uses: actions/checkout@v3
-#       with:
-#         fetch-depth: 0
+    - name: checkout
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
 
-#     - name: Install Rust
-#       uses: actions-rs/toolchain@v1
-#       with:
-#         toolchain: stable
-#         target: x86_64-unknown-linux-gnu
-#         override: true
-#         components: rustfmt, clippy
+    - name: Install Rust
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        target: x86_64-unknown-linux-gnu
+        override: true
+        components: rustfmt, clippy
 
-#     - name: Set up cargo cache
-#       uses: actions/cache@v3
-#       continue-on-error: false
-#       with:
-#         path: |
-#           ~/.cargo/bin/
-#           ~/.cargo/registry/index/
-#           ~/.cargo/registry/cache/
-#           ~/.cargo/git/db/
-#           **/target/
-#         key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
-#         restore-keys: ${{ runner.os }}-cargo-
+    - name: Set up cargo cache
+      uses: Swatinem/rust-cache@v2
+      continue-on-error: false
+      with:
+        workspaces: |
+          zeroidc/
 
-#     - name: validate-1m-linux
-#       env:
-#         CC: 'gcc'
-#         CXX: 'g++'
-#         BRANCH: ${{  github.ref_name }}
-#       run: |
-#         sudo apt install -y valgrind xmlstarlet gcovr iperf3
-#         make one ZT_COVERAGE=1 ZT_TRACE=1
-#         sudo chmod +x ./.github/workflows/validate-1m-linux.sh
-#         sudo ./.github/workflows/validate-1m-linux.sh
+    - name: validate-1m-linux
+      env:
+        CC: 'gcc'
+        CXX: 'g++'
+        BRANCH: ${{  github.ref_name }}
+      run: |
+        sudo apt install -y valgrind xmlstarlet gcovr iperf3
+        make one ZT_COVERAGE=1 ZT_TRACE=1
+        sudo chmod +x ./.github/workflows/validate-1m-linux.sh
+        sudo ./.github/workflows/validate-1m-linux.sh
 
-#     - name: Archive test results
-#       uses: actions/upload-artifact@v3
-#       with:
-#         name: ${{github.sha}}-test-results
-#         path: "*test-results*"
+    - name: Archive test results
+      uses: actions/upload-artifact@v3
+      with:
+        name: ${{github.sha}}-test-results
+        path: "*test-results*"
 
-#     - name: final-report
-#       run: |
-#         sudo chmod +x ./.github/workflows/report.sh
-#         sudo ./.github/workflows/report.sh
+    - name: final-report
+      run: |
+        sudo chmod +x ./.github/workflows/report.sh
+        sudo ./.github/workflows/report.sh