unos-repository

commit f81ff6cc8d67df9d20be79004eda82822b2c38ab
parent 2a110f9c3d928a7a2e5beca2d3ad226bd9ac347d
Author: Robin Bron <robin.bron@yourhosting.nl>
Date:   Thu,  1 Oct 2026 10:49:26 +0200

Reassemble channels before reading pkgvers out of them

Diffstat:
M
.conductor.yml
 | 
12
++++++------
M
mk/gen-pipeline.sh
 | 
3
++-

2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/.conductor.yml b/.conductor.yml
@@ -122,7 +122,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh --channel edge base-files --pkgver 0.1.0-r6 --repo "$BUCKET_PUBLIC_URL" || { rc=$?; [ "$rc" = 1 ] && exit 0; exit "$rc"; }
+      - ./mk/check-revision.sh --channel edge base-files --pkgver 0.1.0-r7 --repo "$BUCKET_PUBLIC_URL" || { rc=$?; [ "$rc" = 1 ] && exit 0; exit "$rc"; }
       - ./mk/channel-assemble.sh edge
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --channel edge --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" base-files
@@ -135,7 +135,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh --channel edge busybox --pkgver 1.36.1-r8 --repo "$BUCKET_PUBLIC_URL" || { rc=$?; [ "$rc" = 1 ] && exit 0; exit "$rc"; }
+      - ./mk/check-revision.sh --channel edge busybox --pkgver 1.36.1-r9 --repo "$BUCKET_PUBLIC_URL" || { rc=$?; [ "$rc" = 1 ] && exit 0; exit "$rc"; }
       - ./mk/channel-assemble.sh edge
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --channel edge --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" busybox
@@ -332,7 +332,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh --channel edge linkd --pkgver 0.1.0-r1 --repo "$BUCKET_PUBLIC_URL" || { rc=$?; [ "$rc" = 1 ] && exit 0; exit "$rc"; }
+      - ./mk/check-revision.sh --channel edge linkd --pkgver 0.2.0-r1 --repo "$BUCKET_PUBLIC_URL" || { rc=$?; [ "$rc" = 1 ] && exit 0; exit "$rc"; }
       - ./mk/channel-assemble.sh edge
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --channel edge --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" linkd
@@ -814,7 +814,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh --channel stable base-files --pkgver 0.1.0-r6 --repo "$BUCKET_PUBLIC_URL" || { rc=$?; [ "$rc" = 1 ] && exit 0; exit "$rc"; }
+      - ./mk/check-revision.sh --channel stable base-files --pkgver 0.1.0-r7 --repo "$BUCKET_PUBLIC_URL" || { rc=$?; [ "$rc" = 1 ] && exit 0; exit "$rc"; }
       - ./mk/channel-assemble.sh stable
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --channel stable --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" base-files
@@ -827,7 +827,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh --channel stable busybox --pkgver 1.36.1-r8 --repo "$BUCKET_PUBLIC_URL" || { rc=$?; [ "$rc" = 1 ] && exit 0; exit "$rc"; }
+      - ./mk/check-revision.sh --channel stable busybox --pkgver 1.36.1-r9 --repo "$BUCKET_PUBLIC_URL" || { rc=$?; [ "$rc" = 1 ] && exit 0; exit "$rc"; }
       - ./mk/channel-assemble.sh stable
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --channel stable --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" busybox
@@ -1024,7 +1024,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh --channel stable linkd --pkgver 0.1.0-r1 --repo "$BUCKET_PUBLIC_URL" || { rc=$?; [ "$rc" = 1 ] && exit 0; exit "$rc"; }
+      - ./mk/check-revision.sh --channel stable linkd --pkgver 0.2.0-r1 --repo "$BUCKET_PUBLIC_URL" || { rc=$?; [ "$rc" = 1 ] && exit 0; exit "$rc"; }
       - ./mk/channel-assemble.sh stable
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --channel stable --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" linkd
diff --git a/mk/gen-pipeline.sh b/mk/gen-pipeline.sh
@@ -17,8 +17,9 @@ OUT="${ROOT}/.conductor.yml"
 # shellcheck disable=SC1091
 . "${HERE}/channels.inc"
 
+# Unconditional: an existing tree may be stale, and the pkgvers come from it.
 for c in $(chan_targets); do
-  [ -d "$(chan_pkgdir "${c}")" ] || "${HERE}/channel-assemble.sh" "${c}" >/dev/null
+  "${HERE}/channel-assemble.sh" "${c}" >/dev/null
 done
 
 BUILDER_IMAGE="${UNOS_BUILDER_IMAGE:-finwo/unos-builder}"