Merge pull request #1497 from skaut/controlled-node-version

Running collector and its test on NodeJS 20
skaut · Jun 18, 2024 · ba8a5f0 · ba8a5f0
2 parents 0509a29 + 0e08268
commit ba8a5f0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -51,14 +51,12 @@ jobs:
       - name: "Checkout"
         uses: actions/checkout@v4
 
-      - name: "Cache NPM dependencies"
-        uses: actions/cache@v4
+      - name: "Setup Node"
+        uses: actions/setup-node@v4
         with:
-          path: "~/.npm"
-          key: npm-dependencies-${{ runner.os }}-${{ env.cache-version }}-${{ hashFiles('package.json') }}
-          restore-keys: |
-            npm-dependencies-${{ runner.os }}-${{ env.cache-version }}-${{ hashFiles('package.json') }}
-            npm-dependencies-${{ runner.os }}-${{ env.cache-version }}-
+          node-version: 20
+          cache: "npm"
+          cache-dependency-path: 'packages/collector/package-lock.json'
 
       - name: "Install NPM dependencies"
         run: |

diff --git a/.github/workflows/reusable-collect.yml b/.github/workflows/reusable-collect.yml
@@ -18,14 +18,12 @@ jobs:
       - name: "Checkout"
         uses: actions/checkout@v4
 
-      - name: "Cache NPM dependencies"
-        uses: actions/cache@v4
+      - name: "Setup Node"
+        uses: actions/setup-node@v4
         with:
-          path: "~/.npm"
-          key: npm-dependencies-${{ runner.os }}-${{ env.cache-version }}-${{ hashFiles('package.json') }}
-          restore-keys: |
-            npm-dependencies-${{ runner.os }}-${{ env.cache-version }}-${{ hashFiles('package.json') }}
-            npm-dependencies-${{ runner.os }}-${{ env.cache-version }}-
+          node-version: 20
+          cache: "npm"
+          cache-dependency-path: 'packages/collector/package-lock.json'
 
       - name: "Install NPM dependencies"
         run: |