Skip to content

Commit

Permalink
Merge branch 'main' into prometheus-env
Browse files Browse the repository at this point in the history
  • Loading branch information
Naseem authored Jan 28, 2021
2 parents 9ceef95 + de8c2be commit b8b7b86
Show file tree
Hide file tree
Showing 50 changed files with 247,453 additions and 44 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/canary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ jobs:
- name: Install and Build 🔧
if: steps.cache.outputs.cache-hit != 'true'
run: |
npm install --ignore-scripts
npx lerna bootstrap --no-ci
npm ci --ignore-scripts
npx lerna bootstrap
- name: Publish
run: npx lerna publish --canary --yes
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:

- name: Install Dependencies
run: |
npm install --ignore-scripts
npx lerna bootstrap --no-ci --scope @opentelemetry/api --include-dependencies
npm ci --ignore-scripts
npx lerna bootstrap --scope @opentelemetry/api --include-dependencies
- name: Build 🔧
run: |
Expand Down
18 changes: 3 additions & 15 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,31 +28,19 @@ jobs:
with:
args: "./**/*.md -i ./CHANGELOG.md"

- name: restore lerna
uses: actions/cache@master # must use unreleased master to cache multiple paths
id: cache
with:
path: |
node_modules
packages/*/node_modules
metapackages/*/node_modules
key: ${{ runner.os }}-${{ hashFiles('**/package.json') }}

- name: Bootstrap
if: steps.cache.outputs.cache-hit != 'true'
run: |
npm install --only=dev --ignore-scripts
npx lerna bootstrap --no-ci --ignore-scripts -- --only=dev
npm ci --ignore-scripts
npx lerna bootstrap --ignore-scripts
- name: Lint
run: |
npm run lint
npm run lint:examples
- name: Install API Dependencies
run: |
npm install --ignore-scripts
npx lerna bootstrap --no-ci --scope @opentelemetry/api --include-dependencies
run: npx lerna bootstrap --scope @opentelemetry/api --include-dependencies

- name: Build 🔧
run: |
Expand Down
24 changes: 4 additions & 20 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v1
- name: Cache Dependencies
uses: actions/cache@v2
with:
path: |
node_modules
package-lock.json
packages/*/node_modules
key: ${{ runner.os }}-${{ matrix.container }}-${{ hashFiles('**/package.json') }}
- name: Install Root Dependencies
run: npm install --ignore-scripts
run: npm ci --ignore-scripts
- name: Boostrap Dependencies
run: npx lerna bootstrap --no-ci
run: npx lerna bootstrap
- name: Build
run: npm run compile
- name: Unit tests
Expand All @@ -49,18 +41,10 @@ jobs:
uses: actions/checkout@v1
- name: Permission Setup
run: sudo chmod -R 777 /github /__w
- name: Cache Dependencies
uses: actions/cache@v2
with:
path: |
node_modules
package-lock.json
packages/*/node_modules
key: ${{ runner.os }}-node:12-${{ hashFiles('**/package.json') }}
- name: Install Root Dependencies
run: npm install --ignore-scripts
run: npm ci --ignore-scripts
- name: Boostrap Dependencies
run: npx lerna bootstrap --no-ci
run: npx lerna bootstrap
- name: Build
run: npm run compile
- name: Unit tests
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/w3c-integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:

- name: Install
run: |
npm install --ignore-scripts
npx lerna bootstrap --no-ci --scope=propagation-validation-server --include-dependencies
npm ci --ignore-scripts
npx lerna bootstrap --scope=propagation-validation-server --include-dependencies
- name: Build 🔧
run: npm run compile
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,7 @@ typings/

# lock files
yarn.lock
package-lock.json
packages/**/yarn.lock
packages/**/package-lock.json

# docs files
docs
Expand Down
20 changes: 20 additions & 0 deletions backwards-compatability/node10/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions backwards-compatability/node12/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions backwards-compatability/node8/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b8b7b86

Please sign in to comment.