Skip to content

Commit f076088

Browse files
authored
Merge branch 'main' into tree-shaking
2 parents 9ab2a8c + 07a16b7 commit f076088

File tree

2 files changed

+38
-15
lines changed

2 files changed

+38
-15
lines changed

.github/workflows/unit-test.yml

Lines changed: 36 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ jobs:
5555
run: npm run codecov
5656
if: ${{ matrix.node_version == '14' }}
5757
node-windows-tests:
58-
strategy:
59-
fail-fast: false
6058
runs-on: windows-latest
6159
env:
6260
NPM_CONFIG_UNSAFE_PERM: true
@@ -96,15 +94,15 @@ jobs:
9694
run: npm run test
9795
browser-tests:
9896
runs-on: ubuntu-latest
99-
container:
100-
image: circleci/node:16-browsers
10197
env:
10298
NPM_CONFIG_UNSAFE_PERM: true
10399
steps:
104-
- name: Permission Setup
105-
run: sudo chmod -R 777 /github /__w
106100
- name: Checkout
107-
uses: actions/[email protected]
101+
uses: actions/checkout@v3
102+
103+
- uses: actions/setup-node@v3
104+
with:
105+
node-version: 16
108106

109107
- name: restore lerna
110108
id: cache
@@ -126,8 +124,6 @@ jobs:
126124
127125
- name: Build 🔧
128126
run: |
129-
npm run compile
130-
# run additional compilation variants
131127
npx lerna run compile
132128
133129
- name: Unit tests
@@ -136,15 +132,14 @@ jobs:
136132
run: npm run codecov:browser
137133
webworker-tests:
138134
runs-on: ubuntu-latest
139-
container:
140-
image: circleci/node:16-browsers
141135
env:
142136
NPM_CONFIG_UNSAFE_PERM: true
143137
steps:
144-
- name: Permission Setup
145-
run: sudo chmod -R 777 /github /__w
146138
- name: Checkout
147139
uses: actions/[email protected]
140+
- uses: actions/setup-node@v3
141+
with:
142+
node-version: 16
148143

149144
- name: restore lerna
150145
id: cache
@@ -166,11 +161,37 @@ jobs:
166161
167162
- name: Build 🔧
168163
run: |
169-
npm run compile
170-
# run additional compilation variants
171164
npx lerna run compile
172165
173166
- name: Unit tests
174167
run: npm run test:webworker
175168
- name: Report Coverage
176169
run: npm run codecov:webworker
170+
api-eol-node-test:
171+
strategy:
172+
fail-fast: false
173+
matrix:
174+
node_version:
175+
- "8"
176+
- "10"
177+
- "12"
178+
runs-on: ubuntu-latest
179+
steps:
180+
- name: Checkout
181+
uses: actions/checkout@v3
182+
183+
- uses: actions/setup-node@v3
184+
with:
185+
node-version: ${{ matrix.node_version }}
186+
187+
- name: Build
188+
working-directory: ./api
189+
run: |
190+
npm install --ignore-scripts
191+
npm install @types/mocha@^7 mocha@^7 ts-loader@^8 ts-mocha@^8
192+
node ../scripts/version-update.js
193+
tsc --build tsconfig.json tsconfig.esm.json
194+
195+
- name: Test
196+
working-directory: ./api
197+
run: npm test

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ All notable changes to this project will be documented in this file.
1616

1717
### :house: (Internal)
1818

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

2123
### :bug: (Bug Fix)

0 commit comments

Comments
 (0)