Skip to content

Commit 1c9205f

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

File tree

19 files changed

+59466
-74
lines changed

19 files changed

+59466
-74
lines changed

‎.github/workflows/benchmark.yml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,21 @@ jobs:
2525

2626
- run: npm install -g npm@latest
2727

28-
- name: restore lerna
28+
- name: restore node_modules
2929
id: cache
3030
uses: actions/cache@v3
3131
with:
3232
path: |
3333
node_modules
34-
package-lock.json
34+
api/node_modules
3535
packages/*/node_modules
36-
packages/*/package-lock.json
3736
experimental/packages/*/node_modules
38-
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
37+
key: node-tests-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/package-lock.json') }}-10302023
4038

4139
- name: Bootstrap
4240
run: |
43-
npm install --ignore-scripts
44-
npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
41+
npm ci --ignore-scripts
42+
npx lerna bootstrap --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
4543
4644
- name: Build 🔧
4745
run: |

‎.github/workflows/docs.yaml‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,18 @@ jobs:
1515
with:
1616
node-version: '18'
1717

18-
- name: restore lock files
19-
uses: actions/cache@master # must use unreleased master to cache multiple paths
18+
- name: restore node_modules
19+
uses: actions/cache@v3
2020
id: cache
2121
with:
22-
# must be done before bootstrap to not include node_modules files in the cache paths
2322
path: |
24-
package-lock.json
25-
packages/*/package-lock.json
26-
backwards-compatibility/*/package-lock.json
27-
metapackages/*/package-lock.json
28-
packages/*/package-lock.json
29-
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
23+
node_modules
24+
api/node_modules
25+
packages/*/node_modules
26+
experimental/packages/*/node_modules
27+
key: ${{ runner.os }}-unit_test-${{ matrix.node_version }}-${{ hashFiles('**/package-lock.json') }}-10302023
3728

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

‎.github/workflows/lint.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,16 @@ jobs:
4040
with:
4141
path: |
4242
node_modules
43-
package-lock.json
43+
api/node_modules
4444
packages/*/node_modules
45-
packages/*/package-lock.json
4645
experimental/packages/*/node_modules
47-
experimental/packages/*/package-lock.json
48-
key: lint-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('package.json', 'packages/*/package.json', 'experimental/packages/*/package.json') }}-04142022
46+
key: lint-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/package-lock.json') }}-10302023
4947

5048
# On a cache miss, install dependencies
5149
- name: Bootstrap
5250
run: |
53-
npm install --ignore-scripts
54-
npx lerna bootstrap --no-ci --hoist --nohoist='zone.js'
51+
npm ci --ignore-scripts
52+
npx lerna bootstrap --hoist --nohoist='zone.js'
5553
5654
- name: Lint
5755
run: |

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

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,19 @@ jobs:
3939
with:
4040
path: |
4141
node_modules
42-
package-lock.json
42+
api/node_modules
4343
packages/*/node_modules
44-
packages/*/package-lock.json
4544
experimental/packages/*/node_modules
46-
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
45+
key: node-tests-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/package-lock.json') }}-10302023
4846

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

5351
- name: Bootstrap
5452
run: |
55-
npm install --ignore-scripts
56-
npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
53+
npm ci --ignore-scripts
54+
npx lerna bootstrap --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
5755
5856
- name: Build 🔧
5957
run: |
@@ -89,17 +87,15 @@ jobs:
8987
with:
9088
path: |
9189
node_modules
92-
package-lock.json
90+
api/node_modules
9391
packages/*/node_modules
94-
packages/*/package-lock.json
9592
experimental/packages/*/node_modules
96-
experimental/packages/*/package-lock.json
97-
key: node-windows-tests-${{ runner.os }}-${{ hashFiles('package.json', 'packages/*/package.json', 'experimental/packages/*/package.json') }}
93+
key: node-windows-tests-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}-10302023
9894

9995
- name: Bootstrap
10096
run: |
101-
npm install --ignore-scripts
102-
npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
97+
npm ci --ignore-scripts
98+
npx lerna bootstrap --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
10399
104100
- name: Build 🔧
105101
run: |
@@ -128,17 +124,15 @@ jobs:
128124
with:
129125
path: |
130126
node_modules
131-
package-lock.json
127+
api/node_modules
132128
packages/*/node_modules
133-
packages/*/package-lock.json
134129
experimental/packages/*/node_modules
135-
experimental/packages/*/package-lock.json
136-
key: browser-tests-${{ runner.os }}-${{ hashFiles('package.json', 'packages/*/package.json', 'experimental/packages/*/package.json') }}-04292022
130+
key: browser-tests-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}-10302023
137131

138132
- name: Bootstrap
139133
run: |
140-
npm install --ignore-scripts
141-
npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
134+
npm ci --ignore-scripts
135+
npx lerna bootstrap --hoist --nohoist='zone.js' --ignore @opentelemetry/selenium-tests
142136
143137
- name: Build 🔧
144138
run: |
@@ -165,17 +159,15 @@ jobs:
165159
with:
166160
path: |
167161
node_modules
168-
package-lock.json
162+
api/node_modules
169163
packages/*/node_modules
170-
packages/*/package-lock.json
171164
experimental/packages/*/node_modules
172-
experimental/packages/*/package-lock.json
173-
key: webworker-tests-${{ runner.os }}-${{ hashFiles('package.json', 'packages/*/package.json', 'experimental/packages/*/package.json') }}-04292022
165+
key: webworker-tests-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}-10302023
174166

175167
- name: Bootstrap
176168
run: |
177-
npm install --ignore-scripts
178-
npx lerna bootstrap --no-ci --hoist --nohoist='zone.js'
169+
npm ci --ignore-scripts
170+
npx lerna bootstrap --hoist --nohoist='zone.js'
179171
180172
- name: Build 🔧
181173
run: |

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

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,19 @@ jobs:
1818
with:
1919
node-version: '16'
2020

21-
- name: restore lock files
22-
uses: actions/cache@master # must use unreleased master to cache multiple paths
21+
- name: restore node_modules
22+
uses: actions/cache@v3
2323
id: cache
2424
with:
25-
# must be done before bootstrap to not include node_modules files in the cache paths
2625
path: |
27-
package-lock.json
28-
packages/*/package-lock.json
29-
metapackages/*/package-lock.json
30-
packages/*/package-lock.json
31-
integration-tests/*/package-lock.json
32-
key: ${{ runner.os }}-w3c_integration-${{ hashFiles('**/package.json') }}
33-
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) 🔧
41-
if: steps.cache.outputs.cache-hit == 'true'
26+
node_modules
27+
api/node_modules
28+
packages/*/node_modules
29+
experimental/packages/*/node_modules
30+
integration-tests/*/node_modules
31+
key: ${{ runner.os }}-w3c_integration-${{ hashFiles('**/package.json') }}-10302023
32+
33+
- name: Install and Bootstrap 🔧
4234
run: |
4335
npm ci --ignore-scripts
4436
npx lerna bootstrap --hoist --scope=propagation-validation-server --include-dependencies

‎.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)