From 9581fb17959902155ae00f8b8bc71e777c4f436f Mon Sep 17 00:00:00 2001
From: Dan Oved <stangogh@gmail.com>
Date: Mon, 20 Nov 2023 18:29:33 -0800
Subject: [PATCH] Include package.json in cache keys when building solidity in
 CI (#381)

we want to do this so that the dependent contract versions affect the cache, for when contracts are imported via npm by version; if an npm dependency changes, this would result in a new cache key
---
 .github/actions/cache_foundry_build/action.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/actions/cache_foundry_build/action.yml b/.github/actions/cache_foundry_build/action.yml
index e4aaf45ba..6a3d82087 100644
--- a/.github/actions/cache_foundry_build/action.yml
+++ b/.github/actions/cache_foundry_build/action.yml
@@ -20,10 +20,11 @@ runs:
           ${{ inputs.package_folder }}/cache
           ${{ inputs.package_folder }}/out
         # cache key is based on foundry config, contracts source tests, and scripts
-        key: ${{ inputs.package_folder }}${{ inputs.foundry_profile}}-${{ hashFiles(format('{0}/foundry.toml', inputs.package_folder)) }}-${{ hashFiles(format('{0}/src/**/*.sol', inputs.package_folder)) }}-${{ hashFiles(format('{0}/test/**/*.sol', inputs.package_folder)) }}-${{ hashFiles(format('{0}/script/**/*.sol', inputs.package_folder)) }}
+        key: ${{ inputs.package_folder }}${{ inputs.foundry_profile}}-${{ hashFiles(format('{0}/foundry.toml', inputs.package_folder)) }}-${{ hashFiles(format('{0}/src/**/*.sol', inputs.package_folder)) }}-${{ hashFiles(format('{0}/test/**/*.sol', inputs.package_folder)) }}-${{ hashFiles(format('{0}/script/**/*.sol', inputs.package_folder)) }}-${{ hashFiles(format('{0}/package.json', inputs.package_folder)) }}
         # the following backups cache keys are searched, in case an exact match is not found
         # see https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#matching-a-cache-key
         restore-keys: |
+          ${{ inputs.package_folder }}${{ inputs.foundry_profile}}-${{ hashFiles(format('{0}/foundry.toml', inputs.package_folder)) }}-${{ hashFiles(format('{0}/src/**/*.sol', inputs.package_folder)) }}-${{ hashFiles(format('{0}/test/**/*.sol', inputs.package_folder)) }}-${{ hashFiles(format('{0}/package.json', inputs.package_folder)) }}
           ${{ inputs.package_folder }}${{ inputs.foundry_profile}}-${{ hashFiles(format('{0}/foundry.toml', inputs.package_folder)) }}-${{ hashFiles(format('{0}/src/**/*.sol', inputs.package_folder)) }}-${{ hashFiles(format('{0}/test/**/*.sol', inputs.package_folder)) }}-
           ${{ inputs.package_folder }}${{ inputs.foundry_profile}}-${{ hashFiles(format('{0}/foundry.toml', inputs.package_folder)) }}-${{ hashFiles(format('{0}/src/**/*.sol', inputs.package_folder)) }}-
           ${{ inputs.package_folder }}${{ inputs.foundry_profile}}-${{ hashFiles(format('{0}/foundry.toml', inputs.package_folder)) }}-