ci: hash all package.json files for dep caching (#1414)

penrose · May 21, 2023 · 099fca1 · 099fca1
1 parent 966d2a2
commit 099fca1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -25,12 +25,11 @@ runs:
           node_modules
           packages/*/node_modules
         # obviously we need to hash `yarn.lock` because that specifies all our
-        # external dependencies, but we also need to hash `package.json` because
-        # Yarn creates symlinks under `node_modules/@penrose/` for each of our
-        # packages, so we need to update those if any packages are added; note
-        # that this strategy means we cannot use wildcards in the `"packages"`
-        # list in `package.json`, and must instead list them all explicitly
-        key: ${{ runner.os }}-${{ hashFiles('package.json', 'yarn.lock') }}
+        # external dependencies, but we also need to hash all of our
+        # `package.json` files because Yarn creates symlinks under
+        # `node_modules/@penrose/` for each of our packages, so we need to
+        # update those if any packages are added
+        key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock', '**/package.json') }}
     - if: steps.cache.outputs.cache-hit != 'true'
       name: Install packages
       run: yarn

diff --git a/package.json b/package.json
@@ -40,15 +40,7 @@
   },
   "workspaces": {
     "packages": [
-      "packages/components",
-      "packages/core",
-      "packages/docs-site",
-      "packages/edgeworth",
-      "packages/editor",
-      "packages/examples",
-      "packages/optimizer",
-      "packages/roger",
-      "packages/vscode"
+      "packages/*"
     ],
     "nohoist": [
       "**/@types/jest",