ambient.yaml: update to match changed in ambient-driver

Signed-off-by: Lars Wirzenius <liw@liw.fi>
Sponsored-by: author

2 files changed, 66 insertions, 42 deletions

diff --git a/ambient.yaml b/ambient.yaml
index ce60915..19955eb 100644
--- a/ambient.yaml
+++ b/ambient.yaml
@@ -3,7 +3,6 @@ projects:
   256.liw.fi:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/sites/256.liw.fi/src
-    publish_artifacts: true
     plan:
       - action: shell
         shell: |
@@ -11,11 +10,12 @@ projects:
           sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
 
           ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
+    post_plan:
+      - action: rsync
 
   ambient-web:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/ambient-ci/ambient-web/src/
-    publish_artifacts: true
     plan:
       - action: shell
         shell: |
@@ -23,11 +23,12 @@ projects:
           sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
 
           ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
+    post_plan:
+      - action: rsync
 
   apt.liw.fi-keyring:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/apt.liw.fi-keyring/git
-    publish_artifacts: true
     plan:
       # Note: no auto-incrementing version number for this package
       - action: deb
@@ -35,7 +36,6 @@ projects:
   cachedir:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/obnam/cachedir
-    publish_artifacts: true
     pre_plan:
       - action: cargo_fetch
     plan:
@@ -54,11 +54,12 @@ projects:
           dch -v "$version" "CI build under Ambient."
           dch -r ''
       - action: deb
+    post_plan:
+      - action: dput
 
   clab:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/clab/git
-    publish_artifacts: true
     pre_plan:
       - action: cargo_fetch
     plan:
@@ -87,11 +88,12 @@ projects:
           dch -v "$version" "CI build under Ambient."
           dch -r ''
       - action: deb
+    post_plan:
+      - action: dput
 
   doc.subplot.tech:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/subplot/git
-    publish_artifacts: true
     pre_plan:
       - action: cargo_fetch
     plan:
@@ -141,11 +143,12 @@ projects:
                                   --metadata title="$(basename "$yaml" .yaml)" \
                                   -o "$libdocs/$(basename "$md" .md)".html "$md"
                   done
+    post_plan:
+      - action: rsync
 
   ewww:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/ewww/git
-    publish_artifacts: true
     pre_plan:
       - action: cargo_fetch
     plan:
@@ -167,11 +170,12 @@ projects:
           git status --ignored
           git clean -fdx
       - action: deb
+    post_plan:
+      - action: dput
 
   ewww.liw.fi:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/ewww/ewww.liw.fi/src
-    publish_artifacts: true
     plan:
       - action: shell
         shell: |
@@ -179,11 +183,12 @@ projects:
           sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
 
           ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
+    post_plan:
+      - action: rsync
 
   extrautils:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/extrautils/git
-    publish_artifacts: true
     plan:
       - action: shell
         shell: |
@@ -195,21 +200,23 @@ projects:
           dch -v "$version" "CI build under Ambient."
           dch -r ''
       - action: deb
+    post_plan:
+      - action: dput
 
   gtdfh.liw.fi:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/sites/gtdfh.liw.fi/src
-    publish_artifacts: true
     plan:
       - action: shell
         shell: |
           make
           cp gtdfh.html /workspace/artifacts/index.html
+    post_plan:
+      - action: rsync
 
   html-page:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/html-page/git
-    publish_artifacts: false
     pre_plan:
       - action: cargo_fetch
     plan:
@@ -222,7 +229,6 @@ projects:
   jt:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/jt/git
-    publish_artifacts: true
     pre_plan:
       - action: cargo_fetch
     plan:
@@ -244,11 +250,12 @@ projects:
           git status --ignored
           git clean -fdx
       - action: deb
+    post_plan:
+      - action: dput
 
   liw.fi:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/sites/liw.fi/src
-    publish_artifacts: true
     plan:
       - action: shell
         shell: |
@@ -256,11 +263,12 @@ projects:
           sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
 
           ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
+    post_plan:
+      - action: rsync
 
   manifesto.liw.fi:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/sites/manifesto.liw.fi/src
-    publish_artifacts: true
     plan:
       - action: shell
         shell: |
@@ -268,11 +276,12 @@ projects:
           sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
 
           ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
+    post_plan:
+      - action: rsync
 
   noir.liw.fi:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/sites/noir.liw.fi/src
-    publish_artifacts: true
     plan:
       - action: shell
         shell: |
@@ -280,11 +289,12 @@ projects:
           sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
 
           ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
+    post_plan:
+      - action: rsync
 
   obnam:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/obnam/git
-    publish_artifacts: true
     pre_plan:
       - action: cargo_fetch
     plan:
@@ -341,6 +351,8 @@ projects:
           dch -v "$version" "CI build under Ambient."
           dch -r ''
       - action: deb
+    post_plan:
+      - action: dput
 
   # DISABLED: until the test suite runs without Obnam or its server
   # installed.
@@ -348,7 +360,6 @@ projects:
   # obnam-benchmark:
   #   image: ~/tmp/ambient/ambient-boot.qcow2
   #   source: ~/pers/obnam/obnam-benchmark
-  #   publish_artifacts: true
   #   pre_plan:
   #     - action: cargo_fetch
   #   plan:
@@ -375,7 +386,6 @@ projects:
   obnam.org:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/obnam/obnam.org/src
-    publish_artifacts: true
     plan:
       - action: shell
         shell: |
@@ -383,11 +393,12 @@ projects:
           sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
 
           ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
+    post_plan:
+      - action: rsync
 
   pathdedup:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/pathdedup/git
-    publish_artifacts: true
     pre_plan:
       - action: cargo_fetch
     plan:
@@ -406,11 +417,12 @@ projects:
           dch -v "$version" "CI build under Ambient."
           dch -r ''
       - action: deb
+    post_plan:
+      - action: dput
 
   puomi.liw.fi:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/puomi/puomi.liw.fi/src
-    publish_artifacts: true
     plan:
       - action: shell
         shell: |
@@ -418,11 +430,12 @@ projects:
           sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
 
           ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
+    post_plan:
+      - action: rsync
 
   riki.liw.fi:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/riki/riki.liw.fi/src
-    publish_artifacts: true
     plan:
       - action: shell
         shell: |
@@ -430,11 +443,12 @@ projects:
           sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
 
           ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
+    post_plan:
+      - action: rsync
 
   roadmap:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/roadmap/git
-    publish_artifacts: false
     pre_plan:
       - action: cargo_fetch
     plan:
@@ -447,7 +461,6 @@ projects:
   sshca:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/sshca/git
-    publish_artifacts: true
     pre_plan:
       - action: cargo_fetch
     plan:
@@ -456,21 +469,20 @@ projects:
       - action: cargo_clippy
       - action: cargo_build
       - action: cargo_test
-      - action: shell
-        shell: |
-          export PATH="/root/.cargo/bin:$PATH"
+      # - action: shell
+      #   shell: |
+      #     export PATH="/root/.cargo/bin:$PATH"
 
-          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: deb
+      #     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: deb
 
   sshca.liw.fi:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/sshca/sshca.liw.fi/src
-    publish_artifacts: true
     plan:
       - action: shell
         shell: |
@@ -478,11 +490,12 @@ projects:
           sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
 
           ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
+    post_plan:
+      - action: rsync
 
   subplot:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/subplot/git
-    publish_artifacts: true
     pre_plan:
       - action: cargo_fetch
     plan:
@@ -506,12 +519,13 @@ projects:
           git clean -fdx
 
       - action: deb
+    post_plan:
+      - action: dput
 
   # DISABLED until it no longer requires Pandoc.
   # subplot-web:
   #   image: ~/tmp/ambient/ambient-boot.qcow2
   #   source: ~/pers/subplot/subplot-web/src/
-  #   publish_artifacts: true
   #   plan:
   #     - action: shell
   #       shell: |
@@ -523,7 +537,6 @@ projects:
   summain:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/obnam/summain
-    publish_artifacts: true
     pre_plan:
       - action: cargo_fetch
     plan:
@@ -542,11 +555,12 @@ projects:
           dch -v "$version" "CI build under Ambient."
           dch -r ''
       - action: deb
+    post_plan:
+      - action: dput
 
   v-i.liw.fi:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/v-i/v-i.liw.fi/src
-    publish_artifacts: true
     plan:
       - action: shell
         shell: |
@@ -554,11 +568,12 @@ projects:
           sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
 
           ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
+    post_plan:
+      - action: rsync
 
   vmadm:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/vmadm/git
-    publish_artifacts: true
     pre_plan:
       - action: cargo_fetch
     plan:
@@ -577,11 +592,12 @@ projects:
           dch -v "$version" "CI build under Ambient."
           dch -r ''
       - action: deb
+    post_plan:
+      - action: dput
 
   vmadm.liw.fi:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/vmadm/vmadm.liw.fi/src
-    publish_artifacts: true
     plan:
       - action: shell
         shell: |
@@ -589,11 +605,12 @@ projects:
           sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
 
           ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
+    post_plan:
+      - action: rsync
 
   vmdb2:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/vmdb2/git
-    publish_artifacts: true
     plan:
       - action: shell
         shell: |
@@ -608,21 +625,23 @@ projects:
           dch -v "$version" "CI build under Ambient."
           dch -r ''
       - action: deb
+    post_plan:
+      - action: dput
 
   vmdb2-manual:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/vmdb2/git
-    publish_artifacts: true
     plan:
       - action: shell
         shell: |
           ./format.sh
           cp vmdb2.html /workspace/artifacts/index.html
+    post_plan:
+      - action: rsync
 
   vmdb2.liw.fi:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/vmdb2/vmdb2.liw.fi/src
-    publish_artifacts: true
     plan:
       - action: shell
         shell: |
@@ -630,3 +649,5 @@ projects:
           sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
 
           ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
+    post_plan:
+      - action: rsync
diff --git a/bashrc b/bashrc
index 83936b9..c0fecfc 100644
--- a/bashrc
+++ b/bashrc
@@ -216,3 +216,6 @@ fi
 if command -v pathdedup >/dev/null; then
 	PATH="$(pathdedup)"
 fi
+
+# Added by Radicle.
+export PATH="$PATH:/home/liw/.radicle/bin"