Skip to content

Commit c6e1c23

Browse files
committed
Merge remote-tracking branch 'origin/bfops/factor-ci' into bfops/ci-all
2 parents 8ae4217 + 5327a38 commit c6e1c23

4 files changed

Lines changed: 13 additions & 42 deletions

File tree

.github/workflows/ci.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,15 @@ jobs:
296296
with:
297297
global-json-file: global.json
298298

299+
- name: Set up Node.js
300+
uses: actions/setup-node@v4
301+
with:
302+
node-version: 22
303+
304+
- uses: pnpm/action-setup@v4
305+
with:
306+
run_install: true
307+
299308
- name: Run ci lint
300309
run: cargo ci lint
301310

.github/workflows/typescript-lint.yml

Lines changed: 0 additions & 40 deletions
This file was deleted.

tools/ci/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Usage: test
4444

4545
Lints the codebase
4646

47-
Runs rustfmt, clippy, csharpier and generates rust docs to ensure there are no warnings.
47+
Runs rustfmt, clippy, csharpier, TypeScript lint, and generates rust docs to ensure there are no warnings.
4848

4949
**Usage:**
5050
```bash

tools/ci/src/main.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,8 @@ enum CiCmd {
219219
Test,
220220
/// Lints the codebase
221221
///
222-
/// Runs rustfmt, clippy, csharpier and generates rust docs to ensure there are no warnings.
222+
/// Runs rustfmt, clippy, csharpier, TypeScript lint, and generates rust docs to ensure there
223+
/// are no warnings.
223224
Lint,
224225
/// Tests Wasm bindings
225226
///
@@ -702,6 +703,7 @@ fn main() -> Result<()> {
702703
cmd!("dotnet", "csharpier", "--check", ".")
703704
.dir("crates/bindings-csharp")
704705
.run()?;
706+
cmd!("pnpm", "lint").run()?;
705707
// `bindings` is the only crate we care strongly about documenting,
706708
// since we link to its docs.rs from our website.
707709
// We won't pass `--no-deps`, though,

0 commit comments

Comments
 (0)