chore: track package-lock.json

open-telemetry · Oct 30, 2023 · 1c9205f · 1c9205f
1 parent 1c7d7a3
commit 1c9205f
Show file tree

Hide file tree

Showing 19 changed files with 59,466 additions and 74 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -25,23 +25,21 @@ jobs:
 
       - run: npm install -g npm@latest
 
-      - name: restore lerna
+      - name: restore node_modules
         id: cache
         uses: actions/cache@v3
         with:
           path: |
             node_modules
-            package-lock.json
+            api/node_modules
             packages/*/node_modules
-            packages/*/package-lock.json
             experimental/packages/*/node_modules
-            experimental/packages/*/package-lock.json
-          key: node-tests-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('package.json', 'packages/*/package.json', 'experimental/packages/*/package.json') }}-04292022
+          key: node-tests-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/package-lock.json') }}-10302023
 
       - name: Bootstrap
         run: |
-          npm install --ignore-scripts
-          npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
+          npm ci --ignore-scripts
+          npx lerna bootstrap --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
 
       - name: Build 🔧
         run: |

diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -15,28 +15,18 @@ jobs:
         with:
           node-version: '18'
 
-      - name: restore lock files
-        uses: actions/cache@master # must use unreleased master to cache multiple paths
+      - name: restore node_modules
+        uses: actions/cache@v3
         id: cache
         with:
-          # must be done before bootstrap to not include node_modules files in the cache paths
           path: |
-            package-lock.json
-            packages/*/package-lock.json
-            backwards-compatibility/*/package-lock.json
-            metapackages/*/package-lock.json
-            packages/*/package-lock.json
-            integration-tests/*/package-lock.json
-          key: ${{ runner.os }}-unit_test-${{ matrix.node_version }}-${{ hashFiles('**/package.json') }}
-      - name: Install and Build (cache miss) 🔧
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: |
-          npm install --ignore-scripts
-          npx lerna bootstrap --no-ci --hoist --nohoist='zone.js'
-          npm run compile
+            node_modules
+            api/node_modules
+            packages/*/node_modules
+            experimental/packages/*/node_modules
+          key: ${{ runner.os }}-unit_test-${{ matrix.node_version }}-${{ hashFiles('**/package-lock.json') }}-10302023
 
-      - name: Install and Build (cache hit) 🔧
-        if: steps.cache.outputs.cache-hit == 'true'
+      - name: Install and Build 🔧
         run: |
           npm ci --ignore-scripts
           npx lerna bootstrap --hoist --nohoist='zone.js'

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -40,18 +40,16 @@ jobs:
         with:
           path: |
             node_modules
-            package-lock.json
+            api/node_modules
             packages/*/node_modules
-            packages/*/package-lock.json
             experimental/packages/*/node_modules
-            experimental/packages/*/package-lock.json
-          key: lint-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('package.json', 'packages/*/package.json', 'experimental/packages/*/package.json') }}-04142022
+          key: lint-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/package-lock.json') }}-10302023
 
       # On a cache miss, install dependencies
       - name: Bootstrap
         run: |
-          npm install --ignore-scripts
-          npx lerna bootstrap --no-ci --hoist --nohoist='zone.js'
+          npm ci --ignore-scripts
+          npx lerna bootstrap --hoist --nohoist='zone.js'
 
       - name: Lint
         run: |

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -39,21 +39,19 @@ jobs:
         with:
           path: |
             node_modules
-            package-lock.json
+            api/node_modules
             packages/*/node_modules
-            packages/*/package-lock.json
             experimental/packages/*/node_modules
-            experimental/packages/*/package-lock.json
-          key: node-tests-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('package.json', 'packages/*/package.json', 'experimental/packages/*/package.json') }}-04292022
+          key: node-tests-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/package-lock.json') }}-10302023
 
       # temporary fix for https://github.com/nrwl/nx/issues/19022
       - run: npm install --save-dev nx@16.7.4 @nx/devkit@16.7.4
         if: ${{ matrix.node_version == '14' }}
 
       - name: Bootstrap
         run: |
-          npm install --ignore-scripts
-          npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
+          npm ci --ignore-scripts
+          npx lerna bootstrap --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
 
       - name: Build 🔧
         run: |
@@ -89,17 +87,15 @@ jobs:
         with:
           path: |
             node_modules
-            package-lock.json
+            api/node_modules
             packages/*/node_modules
-            packages/*/package-lock.json
             experimental/packages/*/node_modules
-            experimental/packages/*/package-lock.json
-          key: node-windows-tests-${{ runner.os }}-${{ hashFiles('package.json', 'packages/*/package.json', 'experimental/packages/*/package.json') }}
+          key: node-windows-tests-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}-10302023
 
       - name: Bootstrap
         run: |
-          npm install --ignore-scripts
-          npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
+          npm ci --ignore-scripts
+          npx lerna bootstrap --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
 
       - name: Build 🔧
         run: |
@@ -128,17 +124,15 @@ jobs:
         with:
           path: |
             node_modules
-            package-lock.json
+            api/node_modules
             packages/*/node_modules
-            packages/*/package-lock.json
             experimental/packages/*/node_modules
-            experimental/packages/*/package-lock.json
-          key: browser-tests-${{ runner.os }}-${{ hashFiles('package.json', 'packages/*/package.json', 'experimental/packages/*/package.json') }}-04292022
+          key: browser-tests-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}-10302023
 
       - name: Bootstrap
         run: |
-          npm install --ignore-scripts
-          npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
+          npm ci --ignore-scripts
+          npx lerna bootstrap --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
 
       - name: Build 🔧
         run: |
@@ -165,17 +159,15 @@ jobs:
         with:
           path: |
             node_modules
-            package-lock.json
+            api/node_modules
             packages/*/node_modules
-            packages/*/package-lock.json
             experimental/packages/*/node_modules
-            experimental/packages/*/package-lock.json
-          key: webworker-tests-${{ runner.os }}-${{ hashFiles('package.json', 'packages/*/package.json', 'experimental/packages/*/package.json') }}-04292022
+          key: webworker-tests-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}-10302023
 
       - name: Bootstrap
         run: |
-          npm install --ignore-scripts
-          npx lerna bootstrap --no-ci --hoist --nohoist='zone.js'
+          npm ci --ignore-scripts
+          npx lerna bootstrap --hoist --nohoist='zone.js'
 
       - name: Build 🔧
         run: |

diff --git a/.github/workflows/w3c-integration-test.yml b/.github/workflows/w3c-integration-test.yml
@@ -18,27 +18,19 @@ jobs:
         with:
           node-version: '16'
 
-      - name: restore lock files
-        uses: actions/cache@master # must use unreleased master to cache multiple paths
+      - name: restore node_modules
+        uses: actions/cache@v3
         id: cache
         with:
-          # must be done before bootstrap to not include node_modules files in the cache paths
           path: |
-            package-lock.json
-            packages/*/package-lock.json
-            metapackages/*/package-lock.json
-            packages/*/package-lock.json
-            integration-tests/*/package-lock.json
-          key: ${{ runner.os }}-w3c_integration-${{ hashFiles('**/package.json') }}
-
-      - name: Install and Bootstrap (cache miss) 🔧
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: |
-          npm install --ignore-scripts
-          npx lerna bootstrap --no-ci --hoist --scope=propagation-validation-server --include-dependencies
-
-      - name: Install and Bootstrap (cache hit) 🔧
-        if: steps.cache.outputs.cache-hit == 'true'
+            node_modules
+            api/node_modules
+            packages/*/node_modules
+            experimental/packages/*/node_modules
+            integration-tests/*/node_modules
+          key: ${{ runner.os }}-w3c_integration-${{ hashFiles('**/package.json') }}-10302023
+
+      - name: Install and Bootstrap 🔧
         run: |
           npm ci --ignore-scripts
           npx lerna bootstrap --hoist --scope=propagation-validation-server --include-dependencies

diff --git a/.gitignore b/.gitignore
@@ -66,7 +66,6 @@ typings/
 
 # lock files
 yarn.lock
-package-lock.json
 
 # docs files
 docs

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,8 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
 
 ### :house: (Internal)
 
+* chore: track package-lock.json [#4238](https://github.com/open-telemetry/opentelemetry-js/pull/4238) @legendecas
+
 ## 1.17.1
 
 ### :bug: (Bug Fix)