Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: hoist dependencies to speed up ci #2416

Merged
merged 4 commits into from
Aug 17, 2021
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/canary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ jobs:
if: steps.cache.outputs.cache-hit != 'true'
run: |
npm install --ignore-scripts
npx lerna bootstrap --no-ci
npx lerna bootstrap --no-ci --hoist --nohoist='zone.js'
dyladan marked this conversation as resolved.
Show resolved Hide resolved
npm run compile

- name: Install and Build (cache hit) 🔧
if: steps.cache.outputs.cache-hit == 'true'
run: |
npm ci --ignore-scripts
npx lerna bootstrap
npx lerna bootstrap --hoist --nohoist='zone.js'
npm run compile

- name: Publish
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ jobs:
if: steps.cache.outputs.cache-hit != 'true'
run: |
npm install --ignore-scripts
npx lerna bootstrap --no-ci
npx lerna bootstrap --no-ci --hoist --nohoist='zone.js'
npm run compile

- name: Install and Build (cache hit) 🔧
if: steps.cache.outputs.cache-hit == 'true'
run: |
npm ci --ignore-scripts
npx lerna bootstrap
npx lerna bootstrap --hoist --nohoist='zone.js'
npm run compile

- name: Build Docs
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ jobs:
if: steps.cache.outputs.cache-hit == 'true'
run: |
npm ci --ignore-scripts
npx lerna bootstrap --ignore-scripts
npx lerna bootstrap --ignore-scripts --hoist --nohoist='zone.js'

# On a cache miss, fall back to a regular install
- name: Bootstrap (cache miss)
if: steps.cache.outputs.cache-hit != 'true'
run: |
npm install --ignore-scripts
npx lerna bootstrap --no-ci --ignore-scripts -- --only=dev
npx lerna bootstrap --no-ci --ignore-scripts --hoist --nohoist='zone.js' -- --only=dev

- name: Lint
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ jobs:
if: steps.cache.outputs.cache-hit != 'true'
run: |
npm install --ignore-scripts
npx lerna bootstrap --no-ci
npx lerna bootstrap --no-ci --hoist --nohoist='zone.js'
npm run compile

- name: Install and Build (cache hit) 🔧
if: steps.cache.outputs.cache-hit == 'true'
run: |
npm ci --ignore-scripts
npx lerna bootstrap
npx lerna bootstrap --hoist --nohoist='zone.js'
npm run compile

- name: Unit tests
Expand Down Expand Up @@ -85,14 +85,14 @@ jobs:
if: steps.cache.outputs.cache-hit != 'true'
run: |
npm install --ignore-scripts
npx lerna bootstrap --no-ci
npx lerna bootstrap --no-ci --hoist --nohoist='zone.js'
npm run compile

- name: Install and Build (cache hit) 🔧
if: steps.cache.outputs.cache-hit == 'true'
run: |
npm ci --ignore-scripts
npx lerna bootstrap
npx lerna bootstrap --hoist --nohoist='zone.js'
npm run compile

- name: Unit tests
Expand Down
2 changes: 1 addition & 1 deletion examples/grpc-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@grpc/grpc-js": "^1.2.12",
"@grpc/grpc-js": "^1.3.7",
"@opentelemetry/api": "^1.0.2",
"@opentelemetry/exporter-jaeger": "0.24.0",
"@opentelemetry/exporter-zipkin": "0.24.0",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"test": "lerna run test",
"test:browser": "lerna run test:browser",
"test:backcompat": "lerna run test:backcompat",
"bootstrap": "lerna bootstrap",
"bootstrap": "lerna bootstrap --hoist --nohoist='zone.js'",
"changelog": "lerna-changelog",
"codecov": "lerna run codecov",
"codecov:browser": "lerna run codecov:browser",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,6 @@
},
"dependencies": {
"@opentelemetry/semantic-conventions": "0.24.0",
"semver": "^7.1.3"
"semver": "^7.3.5"
}
}
4 changes: 2 additions & 2 deletions packages/opentelemetry-exporter-collector-grpc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
"@opentelemetry/api": "^1.0.2"
},
"dependencies": {
"@grpc/grpc-js": "^1.2.12",
"@grpc/proto-loader": "^0.6.0",
"@grpc/grpc-js": "^1.3.7",
"@grpc/proto-loader": "^0.6.4",
"@opentelemetry/core": "0.24.0",
"@opentelemetry/exporter-collector": "0.24.0",
"@opentelemetry/sdk-metrics-base": "0.24.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"@opentelemetry/api": "^1.0.2"
},
"dependencies": {
"@grpc/proto-loader": "^0.6.0",
"@grpc/proto-loader": "^0.6.4",
"@opentelemetry/core": "0.24.0",
"@opentelemetry/exporter-collector": "0.24.0",
"@opentelemetry/sdk-metrics-base": "0.24.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-instrumentation-http/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,6 @@
"@opentelemetry/core": "0.24.0",
"@opentelemetry/instrumentation": "0.24.0",
"@opentelemetry/semantic-conventions": "0.24.0",
"semver": "^7.1.3"
"semver": "^7.3.5"
}
}
2 changes: 1 addition & 1 deletion packages/opentelemetry-sdk-trace-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@
"@opentelemetry/propagator-b3": "0.24.0",
"@opentelemetry/propagator-jaeger": "0.24.0",
"@opentelemetry/sdk-trace-base": "0.24.0",
"semver": "^7.1.3"
"semver": "^7.3.5"
}
}