From 992fb76419767a784233cff22036e06a174c3f30 Mon Sep 17 00:00:00 2001
From: Aaron Fenyes <aaron.fenyes@fareycircles.ooo>
Date: Fri, 28 Mar 2025 12:30:02 -0700
Subject: [PATCH] Do the Trunk build check as an end-to-end test

This consolidates our whole CI workflow into `cargo test`.
---
 .forgejo/workflows/continuous-integration.yaml | 18 ++++--------------
 app-proto/src/main.rs                          |  3 +++
 app-proto/src/tests.rs                         | 14 ++++++++++++++
 3 files changed, 21 insertions(+), 14 deletions(-)
 create mode 100644 app-proto/src/tests.rs

diff --git a/.forgejo/workflows/continuous-integration.yaml b/.forgejo/workflows/continuous-integration.yaml
index 17bc49c..58b2398 100644
--- a/.forgejo/workflows/continuous-integration.yaml
+++ b/.forgejo/workflows/continuous-integration.yaml
@@ -3,22 +3,11 @@ on:
   push:
     branches: [main]
 jobs:
-  # build the application, reporting success if there are no errors or warnings
-  build:
-    runs-on: docker
-    container:
-      image: cimg/rust:1.85-node
-    defaults:
-      run:
-        working-directory: app-proto
-    steps:
-      - uses: https://code.forgejo.org/actions/checkout@v4
-      - uses: ./.forgejo/setup-trunk
-      - run: RUSTFLAGS='-D warnings' trunk build
-  
   # run the automated tests, reporting success if the tests pass and were built
   # without warnings. the examples are run as tests, because we've configured
-  # each example target with `test = true` and `harness = false` in Cargo.toml
+  # each example target with `test = true` and `harness = false` in Cargo.toml.
+  # Trunk build failures caused by problems outside the Rust source code, like
+  # missing assets, should be caught by `trunk_build_test`
   test:
     runs-on: docker
     container:
@@ -28,4 +17,5 @@ jobs:
         working-directory: app-proto
     steps:
       - uses: https://code.forgejo.org/actions/checkout@v4
+      - uses: ./.forgejo/setup-trunk
       - run: RUSTFLAGS='-D warnings' cargo test
\ No newline at end of file
diff --git a/app-proto/src/main.rs b/app-proto/src/main.rs
index 6ab3e49..e581997 100644
--- a/app-proto/src/main.rs
+++ b/app-proto/src/main.rs
@@ -5,6 +5,9 @@ mod engine;
 mod outline;
 mod specified;
 
+#[cfg(test)]
+mod tests;
+
 use rustc_hash::FxHashSet;
 use sycamore::prelude::*;
 
diff --git a/app-proto/src/tests.rs b/app-proto/src/tests.rs
new file mode 100644
index 0000000..2c5436b
--- /dev/null
+++ b/app-proto/src/tests.rs
@@ -0,0 +1,14 @@
+use std::process::Command;
+
+// build and bundle the application, reporting success if there are no errors or
+// warnings. to see this test fail while others succeed, try moving `index.html`
+// or one of the assets that it links to
+#[test]
+fn trunk_build_test() {
+    let build_status = Command::new("trunk")
+        .arg("build")
+        .env("RUSTFLAGS", "-D warnings")
+        .status()
+        .expect("Call to Trunk failed");
+    assert!(build_status.success());
+}
\ No newline at end of file