ci: update cache key

asmyshlyaev177 · Sep 19, 2024 · 70ef91f · 70ef91f
1 parent fe22f3a
commit 70ef91f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 25 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -39,14 +39,12 @@ jobs:
     - uses: actions/setup-node@v4
       with:
         node-version-file: '.nvmrc'
-        cache: 'npm'
-        cache-dependency-path: 'package-lock.json'
     - uses: actions/cache/restore@v4
       id: cache-node-modules
       with:
         path: |
           ./node_modules
-        key: modules-1-${{ hashFiles('./package-lock.json','./package.json') }}
+        key: modules-1-${{ hashFiles('./package-lock.json') }}
     - name: Install dependencies
       if: steps.cache-node-modules.outputs.cache-hit != 'true'
       run: npm clean-install && npx cross-env HOME=/root PLAYWRIGHT_BROWSERS_PATH=0 npx playwright install chromium firefox webkit
@@ -65,7 +63,7 @@ jobs:
       with:
         path: |
           ./node_modules
-        key: modules-1-${{ hashFiles('./package-lock.json','./package.json') }}
+        key: modules-1-${{ hashFiles('./package-lock.json') }}
 
   build:
     name: build
@@ -88,7 +86,7 @@ jobs:
       with:
         path: |
           ./node_modules
-        key: modules-1-${{ hashFiles('./package-lock.json','./package.json') }}
+        key: modules-1-${{ hashFiles('./package-lock.json') }}
 
     - name: Install dependencies
       if: steps.cache-node-modules.outputs.cache-hit != 'true'
@@ -111,7 +109,7 @@ jobs:
           ./packages/example-nextjs14/.next
           ./packages/example-nextjs15/package.json
           ./packages/example-nextjs15/.next
-        key: modules-2-${{ github.head_ref }}
+        key: modules-2-${{ github.sha }}
 
   testint:
     needs: [build]
@@ -141,7 +139,7 @@ jobs:
           ./packages/example-nextjs14/.next
           ./packages/example-nextjs15/package.json
           ./packages/example-nextjs15/.next
-        key: modules-2-${{ github.head_ref }}
+        key: modules-2-${{ github.sha }}
 
     - name: Run Playwright tests
       run: |
@@ -189,7 +187,7 @@ jobs:
           ./packages/example-nextjs14/.next
           ./packages/example-nextjs15/package.json
           ./packages/example-nextjs15/.next
-        key: modules-2-${{ github.head_ref }}
+        key: modules-2-${{ github.sha }}
 
     - name: Verify the integrity of provenance attestations and registry signatures for installed dependencies
       run: npm audit signatures
@@ -212,3 +210,6 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
         NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
       run: npx semantic-release
+
+    - name: clear cache
+      run: gh cache delete modules-2-${{ github.sha }} --confirm
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -237,11 +237,11 @@
       "dependencies": [
         "build:next15"
       ],
-      "command": "npx next@rc start packages/example-nextjs15 --port 3001",
+      "command": "cd packages/example-next15 && npx next start packages/example-nextjs15 --port 3001",
       "service": true
     },
     "start:demo15:ci": {
-      "command": "npx next@rc start packages/example-nextjs15 --port 3001",
+      "command": "cd packages/example-next15 && npx next start packages/example-nextjs15 --port 3001",
       "service": true
     },
     "start": {

diff --git a/packages/example-nextjs15/package.json b/packages/example-nextjs15/package.json
@@ -11,8 +11,8 @@
   "dependencies": {
     "babel-plugin-react-compiler": "^0.0.0-experimental-fe484b5-20240911",
     "next": "^15.0.0-rc.0",
-    "react": "^19.0.0-rc-d6cb4e77-20240911",
-    "react-dom": "^19.0.0-rc-d6cb4e77-20240911"
+    "react": "^19.0.0-rc-5dcb0097-20240918",
+    "react-dom": "^19.0.0-rc-5dcb0097-20240918"
   },
   "devDependencies": {
     "@types/node": "^20",