Skip to content

Commit f89e5d1

Browse files
authored
Merge branch 'main' into collector-breaking-change-doc
2 parents a0a5625 + 072e38c commit f89e5d1

File tree

56 files changed

+247603
-65
lines changed

Some content is hidden

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

56 files changed

+247603
-65
lines changed

β€Ž.github/workflows/canary.yamlβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ jobs:
3636
- name: Install and Build πŸ”§
3737
if: steps.cache.outputs.cache-hit != 'true'
3838
run: |
39-
npm install --ignore-scripts
40-
npx lerna bootstrap --no-ci
39+
npm ci --ignore-scripts
40+
npx lerna bootstrap
4141
4242
- name: Publish
4343
run: npx lerna publish --canary --yes

β€Ž.github/workflows/docs.ymlβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313

1414
- name: Install Dependencies
1515
run: |
16-
npm install --ignore-scripts
17-
npx lerna bootstrap --no-ci --scope @opentelemetry/api --include-dependencies
16+
npm ci --ignore-scripts
17+
npx lerna bootstrap --scope @opentelemetry/api --include-dependencies
1818
1919
- name: Build πŸ”§
2020
run: |

β€Ž.github/workflows/lint.ymlβ€Ž

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,31 +28,19 @@ jobs:
2828
with:
2929
args: "./**/*.md -i ./CHANGELOG.md"
3030

31-
- name: restore lerna
32-
uses: actions/cache@master # must use unreleased master to cache multiple paths
33-
id: cache
34-
with:
35-
path: |
36-
node_modules
37-
packages/*/node_modules
38-
metapackages/*/node_modules
39-
key: ${{ runner.os }}-${{ hashFiles('**/package.json') }}
40-
4131
- name: Bootstrap
4232
if: steps.cache.outputs.cache-hit != 'true'
4333
run: |
44-
npm install --only=dev --ignore-scripts
45-
npx lerna bootstrap --no-ci --ignore-scripts -- --only=dev
34+
npm ci --ignore-scripts
35+
npx lerna bootstrap --ignore-scripts
4636
4737
- name: Lint
4838
run: |
4939
npm run lint
5040
npm run lint:examples
5141
5242
- name: Install API Dependencies
53-
run: |
54-
npm install --ignore-scripts
55-
npx lerna bootstrap --no-ci --scope @opentelemetry/api --include-dependencies
43+
run: npx lerna bootstrap --scope @opentelemetry/api --include-dependencies
5644

5745
- name: Build πŸ”§
5846
run: |

β€Ž.github/workflows/unit-test.ymlβ€Ž

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,10 @@ jobs:
1919
steps:
2020
- name: Checkout
2121
uses: actions/checkout@v1
22-
- name: Cache Dependencies
23-
uses: actions/cache@v2
24-
with:
25-
path: |
26-
node_modules
27-
package-lock.json
28-
packages/*/node_modules
29-
key: ${{ runner.os }}-${{ matrix.container }}-${{ hashFiles('**/package.json') }}
3022
- name: Install Root Dependencies
31-
run: npm install --ignore-scripts
23+
run: npm ci --ignore-scripts
3224
- name: Boostrap Dependencies
33-
run: npx lerna bootstrap --no-ci
25+
run: npx lerna bootstrap
3426
- name: Build
3527
run: npm run compile
3628
- name: Unit tests
@@ -49,18 +41,10 @@ jobs:
4941
uses: actions/checkout@v1
5042
- name: Permission Setup
5143
run: sudo chmod -R 777 /github /__w
52-
- name: Cache Dependencies
53-
uses: actions/cache@v2
54-
with:
55-
path: |
56-
node_modules
57-
package-lock.json
58-
packages/*/node_modules
59-
key: ${{ runner.os }}-node:12-${{ hashFiles('**/package.json') }}
6044
- name: Install Root Dependencies
61-
run: npm install --ignore-scripts
45+
run: npm ci --ignore-scripts
6246
- name: Boostrap Dependencies
63-
run: npx lerna bootstrap --no-ci
47+
run: npx lerna bootstrap
6448
- name: Build
6549
run: npm run compile
6650
- name: Unit tests

β€Ž.github/workflows/w3c-integration-test.ymlβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515

1616
- name: Install
1717
run: |
18-
npm install --ignore-scripts
19-
npx lerna bootstrap --no-ci --scope=propagation-validation-server --include-dependencies
18+
npm ci --ignore-scripts
19+
npx lerna bootstrap --scope=propagation-validation-server --include-dependencies
2020
2121
- name: Build πŸ”§
2222
run: npm run compile

β€Ž.gitignoreβ€Ž

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,7 @@ typings/
6060

6161
# lock files
6262
yarn.lock
63-
package-lock.json
6463
packages/**/yarn.lock
65-
packages/**/package-lock.json
6664

6765
# docs files
6866
docs

β€Žbackwards-compatability/node10/package-lock.jsonβ€Ž

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žbackwards-compatability/node12/package-lock.jsonβ€Ž

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žbackwards-compatability/node8/package-lock.jsonβ€Ž

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
Β (0)