Merge pull request #1 from software-artificer/ci

Enable CI workflow

Author: software-artificer

.github/workflows/ci.yml

@@ -0,0 +1,40 @@
+name: Test and build
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v5
+    - uses: actions-rust-lang/setup-rust-toolchain@v1
+      with:
+        toolchain: stable
+    - name: Run the test suite
+      run: cargo test --all-features
+
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v5
+    - uses: actions-rust-lang/setup-rust-toolchain@v1
+      with:
+        toolchain: stable
+        components: clippy, rustfmt
+    - name: Run clippy linter
+      run: cargo clippy --all-targets
+    - name: Run formatter
+      run: cargo fmt --check
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v5
+    - uses: actions-rust-lang/setup-rust-toolchain@v1
+      with:
+        toolchain: stable
+    - name: Run the build
+      run: cargo build

src/web/route/enroll.rs

@@ -50,12 +50,12 @@ pub async fn get(
                 flash_messages.error("Provided enroll token is invalid.");
                 Ok(core_web::redirect("/login"))
             }
-            TokenState::Error => Err(core_web::internal_server_error()),
+            TokenState::Error => Err(core_web::internal_server_error().into()),
         },
         Err(err) => {
             tracing::error!("Failed to fetch session state: {err}");
 
-            Err(core_web::internal_server_error())
+            Err(core_web::internal_server_error().into())
         }
     }
 }

src/web/route/login.rs

@@ -27,7 +27,7 @@ pub async fn get(
         Err(err) => {
             tracing::error!("Failed to render the login page: {err}");
 
-            Err(core_web::internal_server_error())
+            Err(core_web::internal_server_error().into())
         }
     }
 }

src/web/route/worlds.rs

@@ -68,7 +68,7 @@ pub async fn get(
         Err(err) => {
             tracing::error!("Failed to load worlds: {err}");
 
-            Err(web::internal_server_error())
+            Err(web::internal_server_error().into())
         }
     }
 }

src/web/template/mod.rs

@@ -56,13 +56,13 @@ pub fn render_template<N: AsRef<str>, C: serde::Serialize>(
     templates: &handlebars::Handlebars,
     name: N,
     data: &Content<C>,
-) -> Result<String, error::InternalError<&'static str>> {
+) -> Result<String, error::Error> {
     match templates.render(name.as_ref(), data) {
         Ok(content) => Ok(content),
         Err(err) => {
             tracing::error!("Failed to render Handlebar template: {err}");
 
-            Err(web::internal_server_error())
+            Err(web::internal_server_error().into())
         }
     }
 }
@@ -71,7 +71,7 @@ pub fn render_response<N: AsRef<str>, C: serde::Serialize>(
     templates: &handlebars::Handlebars,
     name: N,
     data: &Content<C>,
-) -> Result<actix_web::HttpResponse, error::InternalError<&'static str>> {
+) -> Result<actix_web::HttpResponse, error::Error> {
     render_template(templates, name, data).map(|content| {
         actix_web::HttpResponse::Ok()
             .content_type(header::ContentType::html())