Merge remote-tracking branch 'origin/master' into feat/-focus-mode-(#110

)
Undeadlol1 · Nov 9, 2020 · d10e9fa · d10e9fa
2 parents 964d7b6 + bd10b28
commit d10e9fa
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 17 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,7 +12,7 @@ on:
       - unlocked
 
 jobs:
-  test:
+  build_then_test:
     runs-on: ubuntu-latest
 
     steps:
@@ -24,8 +24,12 @@ jobs:
         env:
           cache-name: cache-node-modules
         with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          path: |
+            ~/.npm
+            ~/cache
+            !~/cache/exclude
+            **/node_modules
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json', '**/package.json') }}
           restore-keys: |
             ${{ runner.os }}-node-
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -129,7 +129,7 @@
     "@babel/core": "^7.12.3",
     "@storybook/addon-essentials": "^6.0.28",
     "@storybook/node-logger": "^6.0.28",
-    "@storybook/preset-create-react-app": "^3.1.4",
+    "@storybook/preset-create-react-app": "^3.1.5",
     "@testing-library/jest-dom": "^5.11.5",
     "@types/enzyme": "^3.10.8",
     "@types/enzyme-adapter-react-16": "^1.0.5",