From 5eb36a8685ed46bbb1720aca16ebc2da26d8b482 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Mon, 22 Sep 2025 11:42:12 +0300
Subject: [PATCH] ci: use custom dch action for Ambient

---
 .ambient/dch          | 19 ++++++++++++++++++
 .radicle/ambient.yaml | 46 +++++++------------------------------------
 2 files changed, 26 insertions(+), 39 deletions(-)
 create mode 100755 .ambient/dch

diff --git a/.ambient/dch b/.ambient/dch
new file mode 100755
index 0000000..ac2b2e5
--- /dev/null
+++ b/.ambient/dch
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -euo pipefail
+
+export DEBEMAIL="$AMBIENT_CI_debemail"
+export DEBFULLNAME="$AMBIENT_CI_debfullname"
+export CARGO_TARGET_DIR=/workspace/cache
+export CARGO_HOME=/workspace/deps
+export HOME=/root
+export PATH="/root/.cargo/bin:$PATH"
+
+git reset --hard
+git clean -fdx
+
+V="$(dpkg-parsechangelog -SVersion | sed 's/-[^-]*$//')"
+T="$(date -u "+%Y%m%dT%H%M%S")"
+version="$V.ci$T-1"
+dch -v "$version" "CI build under Ambient."
+dch -r ''
diff --git a/.radicle/ambient.yaml b/.radicle/ambient.yaml
index 21dc499..f66a9b2 100644
--- a/.radicle/ambient.yaml
+++ b/.radicle/ambient.yaml
@@ -3,45 +3,13 @@ pre_plan:
 plan:
   - action: cargo_fmt
   - action: cargo_clippy
-
-  # Not using the built-on `cargo_test` action, as the test suite
-  # requires HOME to be set and Ambient doesn't yet have a way to do
-  # that. So we use the `shell` action instead, even if that is more
-  # tedious and requires setting up the relevant environment variables
-  # manually.
-  - action: shell
-    shell: |
-      export CARGO_TARGET_DIR=/workspace/cache
-      export CARGO_HOME=/workspace/deps
-      export HOME=/root
-      export PATH="/root/.cargo/bin:/root/.radicle/bin:$PATH"
-
-      rad --version # make sure rad can be executed
-
-      # Configure Git so that it can be used in the tests for this
-      # project.
-      git config --global user.email "test@example.com"
-      git config --global user.name "Testy McTestface"
-
-      cargo test
-
-  - action: shell
-    shell: |
-      export DEBEMAIL=liw@liw.fi
-      export DEBFULLNAME="Lars Wirzenius"
-      export CARGO_TARGET_DIR=/workspace/cache
-
-      # git reset --hard
-      # git clean -fdx
-      # git switch main
-      git status --ignored
-      # git clean -fdx
-
-      V="$(dpkg-parsechangelog -SVersion | sed 's/-[^-]*$//')"
-      T="$(date -u "+%Y%m%dT%H%M%S")"
-      version="$V.ci$T-1"
-      dch -v "$version" "CI build under Ambient."
-      dch -r ''
+  - action: cargo_test
+  - action: cargo_doc
+  - action: custom
+    name: dch
+    args:
+      debemail: liw@liw.fi
+      debfullname: "Lars Wirzenius"
   - action: deb
 post_plan:
   - action: dput