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.

Sign up for GitHub

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

Jump to bottom

chore: hoist dependencies to speed up ci #2416

Merged
merged 4 commits into from Aug 17, 2021
Merged

chore: hoist dependencies to speed up ci #2416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d87c196
chore: hoist dependencies to speed up ci
dyladan Aug 17, 2021
dc55c90
chore: parallel tests
dyladan Aug 17, 2021
21f4c00
Revert "chore: parallel tests"
dyladan Aug 17, 2021
08ca33d
chore: add missing example deps
dyladan Aug 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/canary.yaml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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: 2 additions & 0 deletions examples/basic-tracer-node/package.json
View file
Open in desktop
Expand Up @@ -26,6 +26,8 @@
"dependencies": {
"@opentelemetry/api": "^1.0.2",
"@opentelemetry/exporter-jaeger": "0.24.0",
"@opentelemetry/resources": "0.24.0",
"@opentelemetry/semantic-conventions": "0.24.0",
"@opentelemetry/sdk-trace-base": "0.24.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
Expand Down
2 changes: 2 additions & 0 deletions examples/collector-exporter-node/package.json
View file
Open in desktop
Expand Up @@ -33,6 +33,8 @@
"@opentelemetry/exporter-collector": "0.24.0",
"@opentelemetry/exporter-collector-grpc": "0.24.0",
"@opentelemetry/exporter-collector-proto": "0.24.0",
"@opentelemetry/resources": "0.24.0",
"@opentelemetry/semantic-conventions": "0.24.0",
"@opentelemetry/sdk-metrics-base": "0.24.0",
"@opentelemetry/sdk-trace-base": "0.24.0"
},
Expand Down
4 changes: 3 additions & 1 deletion examples/grpc-js/package.json
View file
Open in desktop
Expand Up @@ -28,12 +28,14 @@
"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",
"@opentelemetry/instrumentation": "0.24.0",
"@opentelemetry/instrumentation-grpc": "0.24.0",
"@opentelemetry/resources": "0.24.0",
"@opentelemetry/semantic-conventions": "0.24.0",
"@opentelemetry/sdk-trace-node": "0.24.0",
"@opentelemetry/sdk-trace-base": "0.24.0",
"google-protobuf": "^3.9.2"
Expand Down
2 changes: 2 additions & 0 deletions examples/grpc/package.json
View file
Open in desktop
Expand Up @@ -33,6 +33,8 @@
"@opentelemetry/exporter-zipkin": "0.24.0",
"@opentelemetry/instrumentation": "0.24.0",
"@opentelemetry/instrumentation-grpc": "0.24.0",
"@opentelemetry/resources": "0.24.0",
"@opentelemetry/semantic-conventions": "0.24.0",
"@opentelemetry/sdk-trace-node": "0.24.0",
"@opentelemetry/sdk-trace-base": "0.24.0",
"google-protobuf": "^3.9.2",
Expand Down
2 changes: 2 additions & 0 deletions examples/http/package.json
View file
Open in desktop
Expand Up @@ -33,6 +33,8 @@
"@opentelemetry/exporter-zipkin": "0.24.0",
"@opentelemetry/instrumentation": "0.24.0",
"@opentelemetry/instrumentation-http": "0.24.0",
"@opentelemetry/resources": "0.24.0",
"@opentelemetry/semantic-conventions": "0.24.0",
"@opentelemetry/sdk-trace-node": "0.24.0",
"@opentelemetry/sdk-trace-base": "0.24.0"
},
Expand Down
2 changes: 2 additions & 0 deletions examples/https/package.json
View file
Open in desktop
Expand Up @@ -34,6 +34,8 @@
"@opentelemetry/exporter-zipkin": "0.24.0",
"@opentelemetry/instrumentation": "0.24.0",
"@opentelemetry/instrumentation-http": "0.24.0",
"@opentelemetry/resources": "0.24.0",
"@opentelemetry/semantic-conventions": "0.24.0",
"@opentelemetry/sdk-trace-node": "0.24.0",
"@opentelemetry/sdk-trace-base": "0.24.0"
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-collector-proto/package.json
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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"
}
}