CI - Move simple jobs into cargo ci

Author: bfops

.github/workflows/ci.yml

@@ -342,24 +342,8 @@ jobs:
       - uses: dsherret/rust-toolchain-file@v1
       - name: Set default rust toolchain
         run: rustup default $(rustup show active-toolchain | cut -d' ' -f1)
-      - name: Set up Python env
-        run: |
-          test -d venv || python3 -m venv venv
-          venv/bin/pip3 install argparse toml
       - name: Run checks
-        run: |
-          set -ueo pipefail
-          FAILED=0
-          ROOTS=(spacetimedb spacetimedb-sdk)
-          CRATES=$(venv/bin/python3 tools/find-publish-list.py --recursive --directories --quiet "${ROOTS[@]}")
-          for crate_dir in $CRATES; do
-            if ! venv/bin/python3 tools/crate-publish-checks.py "${crate_dir}"; then
-              FAILED=$(( $FAILED + 1 ))
-            fi
-          done
-          if [ $FAILED -gt 0 ]; then
-            exit 1
-          fi
+        run: cargo ci publish-checks
 
   update:
     name: Test spacetimedb-update flow (${{ matrix.target }})
@@ -1178,13 +1162,12 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pnpm-store-
 
-      - name: Install dependencies
-        working-directory: docs
-        run: pnpm install
+      - uses: dsherret/rust-toolchain-file@v1
+      - name: Set default rust toolchain
+        run: rustup default $(rustup show active-toolchain | cut -d' ' -f1)
 
       - name: Docusaurus build
-        working-directory: docs
-        run: pnpm build
+        run: cargo ci docs
 
   typescript-test:
     name: TypeScript - Tests
@@ -1216,14 +1199,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pnpm-store-
 
-      - name: Build module library and SDK
-        working-directory: crates/bindings-typescript
-        run: pnpm build
-
-      - name: Run module library and SDK tests
-        working-directory: crates/bindings-typescript
-        run: pnpm test
-
       # - name: Extract SpacetimeDB branch name from file
       #   id: extract-branch
       #   run: |
@@ -1293,46 +1268,8 @@ jobs:
           # Clear any existing information
           spacetime server clear -y
 
-      - name: Generate client bindings
-        working-directory: templates/chat-react-ts
-        run: |
-          pnpm generate
-
-      - name: Check for changes
-        working-directory: templates/chat-react-ts
-        run: |
-          "${GITHUB_WORKSPACE}"/tools/check-diff.sh src/module_bindings || {
-            echo "Error: Bindings are dirty. Please generate bindings again and commit them to this branch."
-            exit 1
-          }
-
-      # - name: Start SpacetimeDB
-      #   run: |
-      #     spacetime start &
-      #     disown
-
-      # - name: Publish module to SpacetimeDB
-      #   working-directory: SpacetimeDB/templates/quickstart-chat-typescript/spacetimedb
-      #   run: |
-      #     spacetime logout && spacetime login --server-issued-login local
-      #     spacetime publish -s local quickstart-chat -c -y
-
-      # - name: Publish module to SpacetimeDB
-      #   working-directory: SpacetimeDB/templates/quickstart-chat-typescript/spacetimedb
-      #   run: |
-      #     spacetime logs quickstart-chat
-
-      - name: Check that quickstart-chat builds
-        working-directory: templates/chat-react-ts
-        run: pnpm build
-
-      - name: Check that templates build
-        working-directory: templates/
-        run: pnpm -r --filter "./**" run build
-
-      - name: Check that subdirectories build
-        working-directory: crates/bindings-typescript
-        run: pnpm -r --filter "./**" run build
+      - name: Run TypeScript tests
+        run: cargo ci typescript-test
 
       # - name: Run quickstart-chat tests
       #   working-directory: examples/quickstart-chat

tools/ci/src/main.rs

@@ -1,8 +1,9 @@
 #![allow(clippy::disallowed_macros)]
 
-use anyhow::{bail, Result};
+use anyhow::{bail, ensure, Result};
 use clap::{CommandFactory, Parser, Subcommand};
 use duct::cmd;
+use regex::Regex;
 use std::ffi::OsStr;
 use std::ffi::OsString;
 use std::path::Path;
@@ -272,6 +273,12 @@ enum CiCmd {
 
     /// Verify that any non-root global.json files are symlinks to the root global.json.
     GlobalJsonPolicy,
+    /// Checks that publishable crates satisfy publish constraints.
+    PublishChecks,
+    /// Runs TypeScript workspace tests and template build checks.
+    TypescriptTest,
+    /// Builds the docs site.
+    Docs,
 }
 
 fn run_all_clap_subcommands(skips: &[String]) -> Result<()> {
@@ -300,6 +307,65 @@ fn tracked_rs_files_under(path: &str) -> Result<Vec<PathBuf>> {
         .collect())
 }
 
+fn run_publish_checks() -> Result<()> {
+    cmd!("bash", "-lc", "test -d venv || python3 -m venv venv").run()?;
+    cmd!("venv/bin/pip3", "install", "argparse", "toml").run()?;
+
+    let crates = cmd!(
+        "venv/bin/python3",
+        "tools/find-publish-list.py",
+        "--recursive",
+        "--directories",
+        "--quiet",
+        "spacetimedb",
+        "spacetimedb-sdk"
+    )
+    .read()?;
+
+    let mut failed = Vec::new();
+    for crate_dir in crates.split_whitespace() {
+        if let Err(err) = cmd!("venv/bin/python3", "tools/crate-publish-checks.py", crate_dir).run() {
+            eprintln!("crate publish checks failed for {crate_dir}: {err}");
+            failed.push(crate_dir.to_string());
+        }
+    }
+
+    if !failed.is_empty() {
+        bail!("crate publish checks failed for: {}", failed.join(", "));
+    }
+
+    Ok(())
+}
+
+fn run_typescript_tests() -> Result<()> {
+    cmd!("pnpm", "build").dir("crates/bindings-typescript").run()?;
+    cmd!("pnpm", "test").dir("crates/bindings-typescript").run()?;
+    cmd!("pnpm", "generate").dir("templates/chat-react-ts").run()?;
+    let diff_status = cmd!(
+        "bash",
+        "tools/check-diff.sh",
+        "templates/chat-react-ts/src/module_bindings"
+    )
+    .run()?;
+    if !diff_status.status.success() {
+        bail!("Bindings are dirty. Please generate bindings again and commit them to this branch.");
+    }
+    cmd!("pnpm", "build").dir("templates/chat-react-ts").run()?;
+    cmd!("pnpm", "-r", "--filter", "./**", "run", "build")
+        .dir("templates")
+        .run()?;
+    cmd!("pnpm", "-r", "--filter", "./**", "run", "build")
+        .dir("crates/bindings-typescript")
+        .run()?;
+    Ok(())
+}
+
+fn run_docs_build() -> Result<()> {
+    cmd!("pnpm", "install").dir("docs").run()?;
+    cmd!("pnpm", "build").dir("docs").run()?;
+    Ok(())
+}
+
 fn main() -> Result<()> {
     env_logger::init();
 
@@ -627,6 +693,18 @@ fn main() -> Result<()> {
             check_global_json_policy()?;
         }
 
+        Some(CiCmd::PublishChecks) => {
+            run_publish_checks()?;
+        }
+
+        Some(CiCmd::TypescriptTest) => {
+            run_typescript_tests()?;
+        }
+
+        Some(CiCmd::Docs) => {
+            run_docs_build()?;
+        }
+
         None => run_all_clap_subcommands(&cli.skip)?,
     }