Skip to content

Commit

Permalink
Merge branch 'main' into tree-shaking
Browse files Browse the repository at this point in the history
  • Loading branch information
dyladan authored Oct 14, 2022
2 parents 9ab2a8c + 07a16b7 commit f076088
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 15 deletions.
51 changes: 36 additions & 15 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ jobs:
run: npm run codecov
if: ${{ matrix.node_version == '14' }}
node-windows-tests:
strategy:
fail-fast: false
runs-on: windows-latest
env:
NPM_CONFIG_UNSAFE_PERM: true
Expand Down Expand Up @@ -96,15 +94,15 @@ jobs:
run: npm run test
browser-tests:
runs-on: ubuntu-latest
container:
image: circleci/node:16-browsers
env:
NPM_CONFIG_UNSAFE_PERM: true
steps:
- name: Permission Setup
run: sudo chmod -R 777 /github /__w
- name: Checkout
uses: actions/[email protected]
uses: actions/checkout@v3

- uses: actions/setup-node@v3
with:
node-version: 16

- name: restore lerna
id: cache
Expand All @@ -126,8 +124,6 @@ jobs:
- name: Build 🔧
run: |
npm run compile
# run additional compilation variants
npx lerna run compile
- name: Unit tests
Expand All @@ -136,15 +132,14 @@ jobs:
run: npm run codecov:browser
webworker-tests:
runs-on: ubuntu-latest
container:
image: circleci/node:16-browsers
env:
NPM_CONFIG_UNSAFE_PERM: true
steps:
- name: Permission Setup
run: sudo chmod -R 777 /github /__w
- name: Checkout
uses: actions/[email protected]
- uses: actions/setup-node@v3
with:
node-version: 16

- name: restore lerna
id: cache
Expand All @@ -166,11 +161,37 @@ jobs:
- name: Build 🔧
run: |
npm run compile
# run additional compilation variants
npx lerna run compile
- name: Unit tests
run: npm run test:webworker
- name: Report Coverage
run: npm run codecov:webworker
api-eol-node-test:
strategy:
fail-fast: false
matrix:
node_version:
- "8"
- "10"
- "12"
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node_version }}

- name: Build
working-directory: ./api
run: |
npm install --ignore-scripts
npm install @types/mocha@^7 mocha@^7 ts-loader@^8 ts-mocha@^8
node ../scripts/version-update.js
tsc --build tsconfig.json tsconfig.esm.json
- name: Test
working-directory: ./api
run: npm test
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ All notable changes to this project will be documented in this file.

### :house: (Internal)

* ci: run browser tests without circle [#3328](https://github.com/open-telemetry/opentelemetry-js/pull/3328) @dyladan

## 1.7.0

### :bug: (Bug Fix)
Expand Down

0 comments on commit f076088

Please sign in to comment.