Skip to content

Commit 88ef052

Browse files
committed
chore: streamline CI workflow
1 parent 400e502 commit 88ef052

File tree

4 files changed

+31
-19
lines changed

4 files changed

+31
-19
lines changed

Diff for: .github/workflows/ci_main.yml

+3-14
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,10 @@ jobs:
2525
node-version: ${{ matrix.node }}
2626

2727
- name: Build, test and lint all projects (except website)
28-
run: yarn nx run-many -t build lint test --exclude=rxjs.dev
29-
30-
- name: rxjs lint
31-
run: yarn workspace rxjs lint
32-
- name: rxjs build
33-
run: yarn workspace rxjs build
34-
- name: rxjs test
35-
run: yarn workspace rxjs test
36-
- name: rxjs dtslint
37-
run: yarn workspace rxjs dtslint
38-
- name: rxjs test:import
39-
run: yarn workspace rxjs test:import
40-
- name: rxjs test:esm
41-
run: yarn workspace rxjs test:esm
28+
run: yarn nx run-many -t build lint test dtslint test:import test:esm --exclude=rxjs.dev
29+
4230
- name: rxjs.dev build
4331
run: yarn workspace rxjs.dev build --prod
32+
4433
- name: rxjs.dev test
4534
run: yarn workspace rxjs.dev test --watch=false --browsers=ChromeHeadless

Diff for: nx.json

-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
"inputs": ["production", "^production"],
1010
"cache": true
1111
},
12-
"test:circular": {
13-
"dependsOn": ["build"]
14-
},
1512
"test": {
1613
"cache": true
1714
},

Diff for: package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@
5555
"prettier --write"
5656
],
5757
"*.{js,css,md}": "prettier --write"
58+
},
59+
"volta": {
60+
"node": "20.11.1",
61+
"yarn": "1.22.21"
5862
}
5963
}
60-

Diff for: packages/rxjs/package.json

+24-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
},
6161
"scripts": {
6262
"lint": "eslint --ext=ts,js src spec spec-dtslint",
63-
"dtslint": "npm run lint && tsc -b ./src/tsconfig.types.json",
63+
"dtslint": "tsc -b ./src/tsconfig.types.json",
6464
"test": "cross-env TS_NODE_PROJECT=tsconfig.mocha.json mocha --config spec/support/.mocharc.js \"spec/**/*-spec.ts\"",
6565
"test:esm": "node spec/module-test-spec.mjs",
6666
"test:circular": "dependency-cruiser --validate .dependency-cruiser.json -x \"^node_modules\" dist/esm",
@@ -180,6 +180,29 @@
180180
"dependsOn": [
181181
"^build"
182182
]
183+
},
184+
"test:esm": {
185+
"dependsOn": [
186+
"build"
187+
],
188+
"cache": true
189+
},
190+
"test:circular": {
191+
"dependsOn": [
192+
"build"
193+
]
194+
},
195+
"test:import": {
196+
"dependsOn": [
197+
"build"
198+
],
199+
"cache": true
200+
},
201+
"dtslint": {
202+
"dependsOn": [
203+
"^build"
204+
],
205+
"cache": true
183206
}
184207
}
185208
}

0 commit comments

Comments
 (0)