Skip to content

Commit ee87667

Browse files
author
kirrg001
committed
chore: switched to npm workspaces
refs 80779 - removed package lock files - more coming soon
1 parent 89ac911 commit ee87667

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+34486
-98661
lines changed

‎.circleci/config.yml

Lines changed: 37 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -36,52 +36,61 @@ shared: &shared
3636
- v{{ .Environment.CACHE_VERSION }}-root-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
3737
- restore_cache:
3838
keys:
39-
- v{{ .Environment.CACHE_VERSION }}-autoprofile-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/autoprofile/package-lock.json" }}
39+
- v{{ .Environment.CACHE_VERSION }}-autoprofile-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
4040
- restore_cache:
4141
keys:
42-
- v{{ .Environment.CACHE_VERSION }}-aws-fargate-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/aws-fargate/package-lock.json" }}
42+
- v{{ .Environment.CACHE_VERSION }}-aws-fargate-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
4343
- restore_cache:
4444
keys:
45-
- v{{ .Environment.CACHE_VERSION }}-aws-lambda-auto-wrap-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/aws-lambda-auto-wrap/package-lock.json" }}
45+
- v{{ .Environment.CACHE_VERSION }}-aws-lambda-auto-wrap-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
4646
- restore_cache:
4747
keys:
48-
- v{{ .Environment.CACHE_VERSION }}-aws-lambda-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/aws-lambda/package-lock.json" }}
48+
- v{{ .Environment.CACHE_VERSION }}-aws-lambda-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
4949
- restore_cache:
5050
keys:
51-
- v{{ .Environment.CACHE_VERSION }}-collector-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/collector/package-lock.json" }}
51+
- v{{ .Environment.CACHE_VERSION }}-collector-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
5252
- restore_cache:
5353
keys:
5454
- v{{ .Environment.CACHE_VERSION }}-babel-typescript-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/collector/test/apps/babel-typescript/package-lock.json" }}
5555
- restore_cache:
5656
keys:
57-
- v{{ .Environment.CACHE_VERSION }}-core-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/core/package-lock.json" }}
57+
- v{{ .Environment.CACHE_VERSION }}-core-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
5858
- restore_cache:
5959
keys:
60-
- v{{ .Environment.CACHE_VERSION }}-google-cloud-run-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/google-cloud-run/package-lock.json" }}
60+
- v{{ .Environment.CACHE_VERSION }}-google-cloud-run-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
6161
- restore_cache:
6262
keys:
63-
- v{{ .Environment.CACHE_VERSION }}-legacy-sensor-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/legacy-sensor/package-lock.json" }}
63+
- v{{ .Environment.CACHE_VERSION }}-legacy-sensor-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
6464
- restore_cache:
6565
keys:
66-
- v{{ .Environment.CACHE_VERSION }}-metrics-util-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/metrics-util/package-lock.json" }}
66+
- v{{ .Environment.CACHE_VERSION }}-metrics-util-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
6767
- restore_cache:
6868
keys:
69-
- v{{ .Environment.CACHE_VERSION }}-serverless-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/serverless/package-lock.json" }}
69+
- v{{ .Environment.CACHE_VERSION }}-serverless-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
7070
- restore_cache:
7171
keys:
72-
- v{{ .Environment.CACHE_VERSION }}-shared-metrics-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/shared-metrics/package-lock.json" }}
72+
- v{{ .Environment.CACHE_VERSION }}-shared-metrics-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
7373
- restore_cache:
7474
keys:
75-
- v{{ .Environment.CACHE_VERSION }}-opentelemetry-exporter-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/opentelemetry-exporter/package-lock.json" }}
75+
- v{{ .Environment.CACHE_VERSION }}-opentelemetry-exporter-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
7676
- restore_cache:
7777
keys:
78-
- v{{ .Environment.CACHE_VERSION }}-misc-test-durations-{{ .Environment.CIRCLE_JOB }}-{{ checksum "misc/test-durations/package-lock.json" }}
78+
- v{{ .Environment.CACHE_VERSION }}-misc-test-durations-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
79+
80+
- run: |
81+
if [[ $(node -v) =~ ^v10.*$ ]]; then
82+
npm install -g npm@7 --prefix=$HOME/.local
83+
else
84+
npm install -g npm@latest --prefix=$HOME/.local
85+
fi
86+
87+
- run: npm --version
7988

8089
# We do not use npm ci (short for clean install) because it removes the existing node_modules folder. But we want to
8190
# re-use the existing node_modules folders from CircleCI's cache. Using npm ci would defeat that purpose. For the
8291
# same purpose, we reset the package lock file after running npm install. Sometimes npm install updates the lock
8392
# file and that will also break caching because its checksum would then change between save_cache and restore_cache
84-
# in the next CI run.
93+
# in the next CI run.
8594
- run: npm install && git checkout package-lock.json
8695

8796
- run: cd misc/test-durations && npm install && git checkout package-lock.json
@@ -95,55 +104,55 @@ shared: &shared
95104
- save_cache:
96105
paths:
97106
- packages/autoprofile/node_modules
98-
key: v{{ .Environment.CACHE_VERSION }}-autoprofile-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/autoprofile/package-lock.json" }}
107+
key: v{{ .Environment.CACHE_VERSION }}-autoprofile-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
99108
- save_cache:
100109
paths:
101110
- packages/aws-fargate/node_modules
102-
key: v{{ .Environment.CACHE_VERSION }}-aws-fargate-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/aws-fargate/package-lock.json" }}
111+
key: v{{ .Environment.CACHE_VERSION }}-aws-fargate-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
103112
- save_cache:
104113
paths:
105114
- packages/aws-lambda-auto-wrap/node_modules
106-
key: v{{ .Environment.CACHE_VERSION }}-aws-lambda-auto-wrap-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/aws-lambda-auto-wrap/package-lock.json" }}
115+
key: v{{ .Environment.CACHE_VERSION }}-aws-lambda-auto-wrap-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
107116
- save_cache:
108117
paths:
109118
- packages/aws-lambda/node_modules
110-
key: v{{ .Environment.CACHE_VERSION }}-aws-lambda-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/aws-lambda/package-lock.json" }}
119+
key: v{{ .Environment.CACHE_VERSION }}-aws-lambda-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
111120
- save_cache:
112121
paths:
113122
- packages/collector/node_modules
114-
key: v{{ .Environment.CACHE_VERSION }}-collector-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/collector/package-lock.json" }}
123+
key: v{{ .Environment.CACHE_VERSION }}-collector-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
115124
- save_cache:
116125
paths:
117126
- packages/core/node_modules
118-
key: v{{ .Environment.CACHE_VERSION }}-core-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/core/package-lock.json" }}
127+
key: v{{ .Environment.CACHE_VERSION }}-core-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
119128
- save_cache:
120129
paths:
121130
- packages/google-cloud-run/node_modules
122-
key: v{{ .Environment.CACHE_VERSION }}-google-cloud-run-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/google-cloud-run/package-lock.json" }}
131+
key: v{{ .Environment.CACHE_VERSION }}-google-cloud-run-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
123132
- save_cache:
124133
paths:
125134
- packages/legacy-sensor/node_modules
126-
key: v{{ .Environment.CACHE_VERSION }}-legacy-sensor-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/legacy-sensor/package-lock.json" }}
135+
key: v{{ .Environment.CACHE_VERSION }}-legacy-sensor-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
127136
- save_cache:
128137
paths:
129138
- packages/metrics-util/node_modules
130-
key: v{{ .Environment.CACHE_VERSION }}-metrics-util-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/metrics-util/package-lock.json" }}
139+
key: v{{ .Environment.CACHE_VERSION }}-metrics-util-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
131140
- save_cache:
132141
paths:
133142
- packages/serverless/node_modules
134-
key: v{{ .Environment.CACHE_VERSION }}-serverless-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/serverless/package-lock.json" }}
143+
key: v{{ .Environment.CACHE_VERSION }}-serverless-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
135144
- save_cache:
136145
paths:
137146
- packages/shared-metrics/node_modules
138-
key: v{{ .Environment.CACHE_VERSION }}-shared-metrics-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/shared-metrics/package-lock.json" }}
147+
key: v{{ .Environment.CACHE_VERSION }}-shared-metrics-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
139148
- save_cache:
140149
paths:
141150
- packages/opentelemetry-exporter/node_modules
142-
key: v{{ .Environment.CACHE_VERSION }}-opentelemetry-exporter-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/opentelemetry-exporter/package-lock.json" }}
151+
key: v{{ .Environment.CACHE_VERSION }}-opentelemetry-exporter-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
143152
- save_cache:
144153
paths:
145154
- misc/test-durations/node_modules
146-
key: v{{ .Environment.CACHE_VERSION }}-misc-test-durations-{{ .Environment.CIRCLE_JOB }}-{{ checksum "misc/test-durations/package-lock.json" }}
155+
key: v{{ .Environment.CACHE_VERSION }}-misc-test-durations-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
147156

148157
# Only run audit with the most recent Node.js version - one Node version is enough.
149158
- run: "([[ $(node -v) =~ ^v16.*$ ]] && npm run audit) || [[ ! $(node -v) =~ ^v16.*$ ]]"
@@ -338,4 +347,4 @@ workflows:
338347
- "node-16"
339348
- "node-14"
340349
- "node-12"
341-
- "node-10"
350+
- "node-10"

‎bin/add-to-package-lock

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)