From 6d926f0413bbe4c43905a25aabdf95d61b2bf3f5 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Wed, 14 May 2025 05:24:02 +0000
Subject: [PATCH] Add typos lint to workflow.

Signed-off-by: Jason Volk <jason@zemos.net>
---
 .github/workflows/lint.yml    | 17 +++++++++++++++++
 .typos.toml                   |  6 ++++++
 docker/Dockerfile.cargo.typos | 21 +++++++++++++++++++++
 docker/bake.hcl               | 18 ++++++++++++++++++
 4 files changed, 62 insertions(+)
 create mode 100644 .typos.toml
 create mode 100644 docker/Dockerfile.cargo.typos

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 5b189ba3..ab768b07 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -54,6 +54,23 @@ jobs:
       excludes: ${{inputs.excludes}}
       includes: ${{inputs.includes}}
 
+  typos:
+    if: ${{ !failure() && !cancelled() && contains(fromJSON(inputs.cargo_profiles), fromJSON('["test"]')[0]) && contains(fromJSON(inputs.feat_sets), fromJSON('["all"]')[0]) && contains(fromJSON(inputs.rust_toolchains), fromJSON('["nightly"]')[0]) }}
+    name: Typos
+    uses: ./.github/workflows/bake.yml
+    with:
+      bake_targets: '["typos"]'
+      cargo_profiles: '["test"]'
+      feat_sets: '["all"]'
+      rust_toolchains: '["nightly"]'
+      sys_names: ${{inputs.sys_names}}
+      sys_versions: ${{inputs.sys_versions}}
+      rust_targets: ${{inputs.rust_targets}}
+      sys_targets: ${{inputs.sys_targets}}
+      machines: ${{inputs.machines}}
+      excludes: ${{inputs.excludes}}
+      includes: ${{inputs.includes}}
+
   audit:
     if: ${{ !failure() && !cancelled() && contains(fromJSON(inputs.cargo_profiles), fromJSON('["test"]')[0]) && contains(fromJSON(inputs.feat_sets), fromJSON('["all"]')[0]) && contains(fromJSON(inputs.rust_toolchains), fromJSON('["nightly"]')[0]) }}
     name: Audit
diff --git a/.typos.toml b/.typos.toml
new file mode 100644
index 00000000..307d35e7
--- /dev/null
+++ b/.typos.toml
@@ -0,0 +1,6 @@
+[default.extend-words]
+"allocatedp" = "allocatedp"
+"conduwuit" = "conduwuit"
+"execuse" = "execuse"
+"leafs" = "leafs"
+"serialize" = "serialize"
diff --git a/docker/Dockerfile.cargo.typos b/docker/Dockerfile.cargo.typos
new file mode 100644
index 00000000..e4a69917
--- /dev/null
+++ b/docker/Dockerfile.cargo.typos
@@ -0,0 +1,21 @@
+# syntax = docker/dockerfile:1.11-labs
+
+FROM input AS typos
+ARG rust_toolchain="nightly"
+ARG RUSTUP_HOME
+ARG CARGO_HOME
+ARG typos_args=""
+
+WORKDIR /usr/src/tuwunel
+RUN \
+--mount=type=cache,dst=${RUSTUP_HOME},sharing=locked \
+--mount=type=cache,dst=${CARGO_HOME},sharing=locked \
+<<EOF
+    set -eux
+    rustup run ${rust_toolchain} \
+        typos \
+            --color always \
+            --exclude docker \
+            --exclude nix \
+            ${typos_args}
+EOF
diff --git a/docker/bake.hcl b/docker/bake.hcl
index 5c5ab793..d276bd92 100644
--- a/docker/bake.hcl
+++ b/docker/bake.hcl
@@ -943,6 +943,23 @@ target "audit" {
     }
 }
 
+target "typos" {
+    name = elem("typos", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target])
+    tags = [
+        elem_tag("typos", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target], "latest"),
+    ]
+    target = "typos"
+    dockerfile = "docker/Dockerfile.cargo.typos"
+    matrix = cargo_rust_feat_sys
+    inherits = [
+        elem("deps-base", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target]),
+        elem("cargo", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target]),
+    ]
+    contexts = {
+        input = elem("target:ingredients", [rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target])
+    }
+}
+
 target "fmt" {
     name = elem("fmt", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target])
     tags = [
@@ -1291,6 +1308,7 @@ cargo_installs = [
     "cargo-arch",
     "cargo-generate-rpm",
     "lychee",
+    "typos-cli",
 ]
 
 #