Skip to content

Commit 22c7915

Browse files
legendecaslegendecas
committed
chore: track package-lock.json
1 parent 1c7d7a3 commit 22c7915

File tree

19 files changed

+59444
-35
lines changed

19 files changed

+59444
-35
lines changed

‎.github/workflows/benchmark.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ jobs:
3636
packages/*/package-lock.json
3737
experimental/packages/*/node_modules
3838
experimental/packages/*/package-lock.json
39-
key: node-tests-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('package.json', 'packages/*/package.json', 'experimental/packages/*/package.json') }}-04292022
39+
key: node-tests-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/package-lock.json') }}-04292022
4040

4141
- name: Bootstrap
4242
run: |
43-
npm install --ignore-scripts
44-
npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
43+
npm ci --ignore-scripts
44+
npx lerna bootstrap --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
4545
4646
- name: Build 🔧
4747
run: |

‎.github/workflows/docs.yaml‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,9 @@ jobs:
2727
metapackages/*/package-lock.json
2828
packages/*/package-lock.json
2929
integration-tests/*/package-lock.json
30-
key: ${{ runner.os }}-unit_test-${{ matrix.node_version }}-${{ hashFiles('**/package.json') }}
31-
- name: Install and Build (cache miss) 🔧
32-
if: steps.cache.outputs.cache-hit != 'true'
33-
run: |
34-
npm install --ignore-scripts
35-
npx lerna bootstrap --no-ci --hoist --nohoist='zone.js'
36-
npm run compile
30+
key: ${{ runner.os }}-unit_test-${{ matrix.node_version }}-${{ hashFiles('**/package-lock.json') }}
3731

38-
- name: Install and Build (cache hit) 🔧
39-
if: steps.cache.outputs.cache-hit == 'true'
32+
- name: Install and Build 🔧
4033
run: |
4134
npm ci --ignore-scripts
4235
npx lerna bootstrap --hoist --nohoist='zone.js'

‎.github/workflows/lint.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ jobs:
4545
packages/*/package-lock.json
4646
experimental/packages/*/node_modules
4747
experimental/packages/*/package-lock.json
48-
key: lint-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('package.json', 'packages/*/package.json', 'experimental/packages/*/package.json') }}-04142022
48+
key: lint-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/package-lock.json') }}-04142022
4949

5050
# On a cache miss, install dependencies
5151
- name: Bootstrap
5252
run: |
53-
npm install --ignore-scripts
54-
npx lerna bootstrap --no-ci --hoist --nohoist='zone.js'
53+
npm ci --ignore-scripts
54+
npx lerna bootstrap --hoist --nohoist='zone.js'
5555
5656
- name: Lint
5757
run: |

‎.github/workflows/unit-test.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ jobs:
4444
packages/*/package-lock.json
4545
experimental/packages/*/node_modules
4646
experimental/packages/*/package-lock.json
47-
key: node-tests-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('package.json', 'packages/*/package.json', 'experimental/packages/*/package.json') }}-04292022
47+
key: node-tests-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/package-lock.json') }}-04292022
4848

4949
# temporary fix for https://github.com/nrwl/nx/issues/19022
5050
- run: npm install --save-dev [email protected] @nx/[email protected]
5151
if: ${{ matrix.node_version == '14' }}
5252

5353
- name: Bootstrap
5454
run: |
55-
npm install --ignore-scripts
56-
npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
55+
npm ci --ignore-scripts
56+
npx lerna bootstrap --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
5757
5858
- name: Build 🔧
5959
run: |
@@ -94,12 +94,12 @@ jobs:
9494
packages/*/package-lock.json
9595
experimental/packages/*/node_modules
9696
experimental/packages/*/package-lock.json
97-
key: node-windows-tests-${{ runner.os }}-${{ hashFiles('package.json', 'packages/*/package.json', 'experimental/packages/*/package.json') }}
97+
key: node-windows-tests-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
9898

9999
- name: Bootstrap
100100
run: |
101-
npm install --ignore-scripts
102-
npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
101+
npm ci --ignore-scripts
102+
npx lerna bootstrap --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
103103
104104
- name: Build 🔧
105105
run: |
@@ -133,12 +133,12 @@ jobs:
133133
packages/*/package-lock.json
134134
experimental/packages/*/node_modules
135135
experimental/packages/*/package-lock.json
136-
key: browser-tests-${{ runner.os }}-${{ hashFiles('package.json', 'packages/*/package.json', 'experimental/packages/*/package.json') }}-04292022
136+
key: browser-tests-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}-04292022
137137

138138
- name: Bootstrap
139139
run: |
140-
npm install --ignore-scripts
141-
npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
140+
npm ci --ignore-scripts
141+
npx lerna bootstrap --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
142142
143143
- name: Build 🔧
144144
run: |
@@ -170,12 +170,12 @@ jobs:
170170
packages/*/package-lock.json
171171
experimental/packages/*/node_modules
172172
experimental/packages/*/package-lock.json
173-
key: webworker-tests-${{ runner.os }}-${{ hashFiles('package.json', 'packages/*/package.json', 'experimental/packages/*/package.json') }}-04292022
173+
key: webworker-tests-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}-04292022
174174

175175
- name: Bootstrap
176176
run: |
177-
npm install --ignore-scripts
178-
npx lerna bootstrap --no-ci --hoist --nohoist='zone.js'
177+
npm ci --ignore-scripts
178+
npx lerna bootstrap --hoist --nohoist='zone.js'
179179
180180
- name: Build 🔧
181181
run: |

‎.github/workflows/w3c-integration-test.yml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,7 @@ jobs:
3131
integration-tests/*/package-lock.json
3232
key: ${{ runner.os }}-w3c_integration-${{ hashFiles('**/package.json') }}
3333

34-
- name: Install and Bootstrap (cache miss) 🔧
35-
if: steps.cache.outputs.cache-hit != 'true'
36-
run: |
37-
npm install --ignore-scripts
38-
npx lerna bootstrap --no-ci --hoist --scope=propagation-validation-server --include-dependencies
39-
40-
- name: Install and Bootstrap (cache hit) 🔧
34+
- name: Install and Bootstrap 🔧
4135
if: steps.cache.outputs.cache-hit == 'true'
4236
run: |
4337
npm ci --ignore-scripts

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ typings/
6666

6767
# lock files
6868
yarn.lock
69-
package-lock.json
7069

7170
# docs files
7271
docs

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
1919

2020
### :house: (Internal)
2121

22+
chore: track package-lock.json [#4238](https://github.com/open-telemetry/opentelemetry-js/pull/4238) @legendecas
23+
2224
## 1.17.1
2325

2426
### :bug: (Bug Fix)

0 commit comments

Comments
 (0)