Skip to content

Commit 5327a38

Browse files
committed
Merge remote-tracking branch 'origin/master' into bfops/factor-ci
2 parents c6813bd + a7729f7 commit 5327a38

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
@@ -292,6 +292,15 @@ jobs:
292292
with:
293293
global-json-file: global.json
294294

295+
- name: Set up Node.js
296+
uses: actions/setup-node@v4
297+
with:
298+
node-version: 22
299+
300+
- uses: pnpm/action-setup@v4
301+
with:
302+
run_install: true
303+
295304
- name: Run ci lint
296305
run: cargo ci lint
297306

.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
@@ -218,7 +218,8 @@ enum CiCmd {
218218
Test,
219219
/// Lints the codebase
220220
///
221-
/// Runs rustfmt, clippy, csharpier and generates rust docs to ensure there are no warnings.
221+
/// Runs rustfmt, clippy, csharpier, TypeScript lint, and generates rust docs to ensure there
222+
/// are no warnings.
222223
Lint,
223224
/// Tests Wasm bindings
224225
///
@@ -506,6 +507,7 @@ fn main() -> Result<()> {
506507
cmd!("dotnet", "csharpier", "--check", ".")
507508
.dir("crates/bindings-csharp")
508509
.run()?;
510+
cmd!("pnpm", "lint").run()?;
509511
// `bindings` is the only crate we care strongly about documenting,
510512
// since we link to its docs.rs from our website.
511513
// We won't pass `--no-deps`, though,

0 commit comments

Comments
 (0)