Skip to content

Commit 6234918

Browse files
authored
chore: use nx commands (open-telemetry#2493)
1 parent 95547b8 commit 6234918

File tree

68 files changed

+137
-75
lines changed

Some content is hidden

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

68 files changed

+137
-75
lines changed

.github/workflows/release-please.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ jobs:
1616
with:
1717
fetch-depth: 0
1818

19+
# If you update this version make sure to keep in sync:
20+
# - `build-and-cache` job of unit-test workflow
21+
# - `build-and-cache` job of test-all-versions workflow
1922
- name: Setup Node
2023
uses: actions/setup-node@v4
2124
with:

.github/workflows/test-all-versions.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,36 @@ on:
1313
type: string
1414

1515
jobs:
16+
build-and-cache:
17+
strategy:
18+
fail-fast: false
19+
runs-on: ubuntu-latest
20+
env:
21+
NPM_CONFIG_UNSAFE_PERM: true
22+
NODE_OPTIONS: --max-old-space-size=4096
23+
steps:
24+
- name: Checkout
25+
uses: actions/checkout@v4
26+
with:
27+
fetch-depth: 0
28+
# Use the same Node.js version used for `release-please` workflow.
29+
- uses: actions/setup-node@v4
30+
with:
31+
node-version: 18
32+
- name: Install
33+
run: npm ci
34+
- name: Build
35+
run: npm run compile
36+
- name: Upload Build Artifacts
37+
uses: actions/upload-artifact@v4
38+
with:
39+
name: tav-build-cache-${{ github.run_number }}
40+
path: node_modules/.cache/nx
41+
retention-days: 1
42+
1643
tav:
1744
name: Run test-all-versions
45+
needs: build-and-cache
1846
strategy:
1947
fail-fast: false
2048
matrix:
@@ -120,6 +148,11 @@ jobs:
120148
run: npm install -g npm@9 # npm@9 supports node >=14.17.0
121149
- name: Install
122150
run: npm ci
151+
- name: Download Build Artifacts
152+
uses: actions/download-artifact@v4
153+
with:
154+
name: tav-build-cache-${{ github.run_number }}
155+
path: node_modules/.cache/nx
123156
- name: Build
124157
run: npm run compile
125158
- name: Run test-all-versions

.github/workflows/unit-test.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,35 @@ on:
55
pull_request:
66

77
jobs:
8+
build-and-cache:
9+
strategy:
10+
fail-fast: false
11+
runs-on: ubuntu-latest
12+
env:
13+
NPM_CONFIG_UNSAFE_PERM: true
14+
NODE_OPTIONS: --max-old-space-size=4096
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@v4
18+
with:
19+
fetch-depth: 0
20+
# Use the same Node.js version used for `release-please` workflow.
21+
- uses: actions/setup-node@v4
22+
with:
23+
node-version: 18
24+
- name: Install
25+
run: npm ci
26+
- name: Build
27+
run: npm run compile
28+
- name: Upload build artifact
29+
uses: actions/upload-artifact@v4
30+
with:
31+
name: tests-build-cache-${{ github.run_number }}
32+
path: node_modules/.cache/nx
33+
retention-days: 1
34+
835
unit-test:
36+
needs: build-and-cache
937
strategy:
1038
fail-fast: false
1139
matrix:
@@ -128,6 +156,11 @@ jobs:
128156
run: npm install -g npm@9 # npm@9 supports node >=14.17.0
129157
- name: Install
130158
run: npm ci
159+
- name: Download Build Artifacts
160+
uses: actions/download-artifact@v4
161+
with:
162+
name: tests-build-cache-${{ github.run_number }}
163+
path: node_modules/.cache/nx
131164
- name: Build
132165
run: npm run compile
133166
- name: Unit tests (Full)
@@ -145,6 +178,7 @@ jobs:
145178
verbose: true
146179

147180
browser-test:
181+
needs: build-and-cache
148182
strategy:
149183
fail-fast: false
150184
matrix:
@@ -166,6 +200,11 @@ jobs:
166200
run: npm install -g npm@9 # npm@9 supports node >=14.17.0
167201
- name: Install
168202
run: npm ci
203+
- name: Download Build Artifacts
204+
uses: actions/download-artifact@v4
205+
with:
206+
name: tests-build-cache-${{ github.run_number }}
207+
path: node_modules/.cache/nx
169208
- name: Build
170209
run: npm run compile
171210
- name: Unit tests

detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"compile": "tsc -p .",
1111
"lint": "eslint . --ext .ts",
1212
"lint:fix": "eslint . --ext .ts --fix",
13-
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-alibaba-cloud --include-dependencies",
1413
"prewatch": "npm run precompile",
1514
"prepublishOnly": "npm run compile",
1615
"test": "nyc mocha 'test/**/*.test.ts'",

detectors/node/opentelemetry-resource-detector-aws/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"compile": "tsc -p .",
1111
"lint": "eslint . --ext .ts",
1212
"lint:fix": "eslint . --ext .ts --fix",
13-
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-aws --include-dependencies",
1413
"prewatch": "npm run precompile",
1514
"prepublishOnly": "npm run compile",
1615
"test": "nyc mocha 'test/**/*.test.ts'",
@@ -40,6 +39,8 @@
4039
"devDependencies": {
4140
"@opentelemetry/api": "^1.0.0",
4241
"@opentelemetry/contrib-test-utils": "^0.42.0",
42+
"@opentelemetry/instrumentation-fs": "^0.16.0",
43+
"@opentelemetry/instrumentation-http": "^0.54.0",
4344
"@types/mocha": "8.2.3",
4445
"@types/node": "18.18.14",
4546
"@types/sinon": "10.0.20",

detectors/node/opentelemetry-resource-detector-azure/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"compile": "tsc -p .",
1111
"lint": "eslint . --ext .ts",
1212
"lint:fix": "eslint . --ext .ts --fix",
13-
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-azure --include-dependencies",
1413
"prewatch": "npm run precompile",
1514
"prepublishOnly": "npm run compile",
1615
"test": "nyc mocha 'test/**/*.test.ts'",
@@ -33,6 +32,7 @@
3332
"devDependencies": {
3433
"@opentelemetry/api": "^1.0.0",
3534
"@opentelemetry/contrib-test-utils": "^0.42.0",
35+
"@opentelemetry/instrumentation-http": "^0.54.0",
3636
"@types/mocha": "8.2.3",
3737
"@types/node": "18.18.14",
3838
"@types/sinon": "10.0.20",

detectors/node/opentelemetry-resource-detector-container/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"compile": "tsc -p .",
1111
"lint": "eslint . --ext .ts",
1212
"lint:fix": "eslint . --ext .ts --fix",
13-
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-container --include-dependencies",
1413
"prewatch": "npm run precompile",
1514
"prepublishOnly": "npm run compile",
1615
"test": "nyc mocha 'test/**/*.test.ts'",
@@ -34,6 +33,7 @@
3433
"devDependencies": {
3534
"@opentelemetry/api": "^1.0.0",
3635
"@opentelemetry/contrib-test-utils": "^0.42.0",
36+
"@opentelemetry/instrumentation-fs": "^0.16.0",
3737
"@types/mocha": "8.2.3",
3838
"@types/node": "18.18.14",
3939
"@types/sinon": "10.0.20",

detectors/node/opentelemetry-resource-detector-gcp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"compile": "tsc -p .",
1111
"lint": "eslint . --ext .ts",
1212
"lint:fix": "eslint . --ext .ts --fix",
13-
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-gcp --include-dependencies",
1413
"prewatch": "npm run precompile",
1514
"prepublishOnly": "npm run compile",
1615
"test": "nyc mocha 'test/**/*.test.ts'",
@@ -40,6 +39,7 @@
4039
"devDependencies": {
4140
"@opentelemetry/api": "^1.0.0",
4241
"@opentelemetry/contrib-test-utils": "^0.42.0",
42+
"@opentelemetry/instrumentation-http": "^0.54.0",
4343
"@types/mocha": "8.2.3",
4444
"@types/node": "18.18.14",
4545
"@types/semver": "7.5.8",

detectors/node/opentelemetry-resource-detector-github/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"compile": "tsc -p .",
1111
"lint": "eslint . --ext .ts",
1212
"lint:fix": "eslint . --ext .ts --fix",
13-
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-github --include-dependencies",
1413
"prewatch": "npm run precompile",
1514
"prepublishOnly": "npm run compile",
1615
"test": "nyc mocha 'test/**/*.test.ts'",

detectors/node/opentelemetry-resource-detector-instana/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"compile": "tsc -p .",
1111
"lint": "eslint . --ext .ts",
1212
"lint:fix": "eslint . --ext .ts --fix",
13-
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-instana --include-dependencies",
1413
"prewatch": "npm run precompile",
1514
"prepublishOnly": "npm run compile",
1615
"test": "nyc mocha 'test/**/*.test.ts'",

0 commit comments

Comments
 (0)