From e1365626c698e229c02a6f3587e6b2f0d637a610 Mon Sep 17 00:00:00 2001
From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com>
Date: Mon, 1 Aug 2022 18:03:04 -0700
Subject: [PATCH 1/3] Add build cache in ci

---
 .github/workflows/rust.yml | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index bd50ec8e..e0c498bf 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -60,22 +60,23 @@ jobs:
     - uses: actions/checkout@v3
     - run: rustup update
     - run: rustup target add ${{ matrix.sys.target }}
-    # TODO: Investigate cache bloat and re-enable.
-    # - uses: actions/cache@v3
-    #   with:
-    #     path: |
-    #       ~/.cargo/registry/index/
-    #       ~/.cargo/registry/cache/
-    #       ~/.cargo/git/db/
-    #     key: cargo-${{ hashFiles('**/Cargo.lock') }}
-    #     restore-keys: cargo-
-    # - uses: actions/cache@v3
-    #   with:
-    #     path: target/
-    #     key: target-${{ strategy.job-index }}-${{ github.sha }}
-    #     restore-keys: |
-    #       target-${{ strategy.job-index }}
-    #       target-
+    - uses: actions/cache@v3
+      with:
+        path: |
+          ~/.cargo/registry/index/
+          ~/.cargo/registry/cache/
+          ~/.cargo/git/db/
+        key: cargo-${{ hashFiles('**/Cargo.lock') }}
+        restore-keys: cargo-
+    - uses: actions/cache@v3
+      with:
+        path: target/
+        key: ${{ github.job }}-target-${{ strategy.job-index }}-${{ github.sha }}
+        restore-keys: |
+          ${{ github.job }}-target-${{ strategy.job-index }}
+          ${{ github.job }}-target-
+    - if: github.ref_protected
+      run: rm -fr target
     - run: cargo install --locked --version 0.5.15 cargo-hack
     - if: "github.ref_protected"
       run: echo 'CARGO_HACK_ARGS=--feature-powerset' >> $GITHUB_ENV

From ac30cde87eecf63f8cf008c8fa9b4bdb42b57ecf Mon Sep 17 00:00:00 2001
From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com>
Date: Mon, 1 Aug 2022 18:04:42 -0700
Subject: [PATCH 2/3] update hackc

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index e0c498bf..83d342e3 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -77,7 +77,7 @@ jobs:
           ${{ github.job }}-target-
     - if: github.ref_protected
       run: rm -fr target
-    - run: cargo install --locked --version 0.5.15 cargo-hack
+    - run: cargo install --locked --version 0.5.16 cargo-hack
     - if: "github.ref_protected"
       run: echo 'CARGO_HACK_ARGS=--feature-powerset' >> $GITHUB_ENV
     - if: "!github.ref_protected"

From bcd48b3cee3a788e094e874436e76681a1ba246b Mon Sep 17 00:00:00 2001
From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com>
Date: Mon, 1 Aug 2022 18:04:51 -0700
Subject: [PATCH 3/3] Revert "update hackc"

This reverts commit ac30cde87eecf63f8cf008c8fa9b4bdb42b57ecf.
---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 83d342e3..e0c498bf 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -77,7 +77,7 @@ jobs:
           ${{ github.job }}-target-
     - if: github.ref_protected
       run: rm -fr target
-    - run: cargo install --locked --version 0.5.16 cargo-hack
+    - run: cargo install --locked --version 0.5.15 cargo-hack
     - if: "github.ref_protected"
       run: echo 'CARGO_HACK_ARGS=--feature-powerset' >> $GITHUB_ENV
     - if: "!github.ref_protected"