From 48c31d0f0c0b4110ffafc1163173aca19c23be67 Mon Sep 17 00:00:00 2001 From: NeilClack Date: Thu, 27 Aug 2026 21:26:45 -0500 Subject: [PATCH] Move home systems to first build slot --- .gitea/workflows/build-dev.yml | 73 +++++++----------- UPDATES.md | 19 +++++ temp/computer-direct_to_kiosk.bin | Bin 0 -> 256 bytes temp/root/computer-direct_to_kiosk.bin | Bin 0 -> 256 bytes ..._hdmi_to_kiosk-out2_wireless__unstable.bin | 0 ..._wireless-out2_hdmi_to_kiosk__unstable.bin | Bin 0 -> 256 bytes ...omputer-splitter_out_1-direct_to_kiosk.bin | Bin 0 -> 256 bytes ...computer-splitter_out_1-wireless-kiosk.bin | Bin 0 -> 256 bytes ...omputer-splitter_out_2-direct_to_kiosk.bin | Bin 0 -> 256 bytes ...computer-splitter_out_2-wireless-kiosk.bin | Bin 0 -> 256 bytes temp/root/computer-wireless.bin | 0 11 files changed, 45 insertions(+), 47 deletions(-) create mode 100644 UPDATES.md create mode 100644 temp/computer-direct_to_kiosk.bin create mode 100644 temp/root/computer-direct_to_kiosk.bin create mode 100644 temp/root/computer-splitter-out1_hdmi_to_kiosk-out2_wireless__unstable.bin create mode 100644 temp/root/computer-splitter-out1_wireless-out2_hdmi_to_kiosk__unstable.bin create mode 100644 temp/root/computer-splitter_out_1-direct_to_kiosk.bin create mode 100644 temp/root/computer-splitter_out_1-wireless-kiosk.bin create mode 100644 temp/root/computer-splitter_out_2-direct_to_kiosk.bin create mode 100644 temp/root/computer-splitter_out_2-wireless-kiosk.bin create mode 100644 temp/root/computer-wireless.bin diff --git a/.gitea/workflows/build-dev.yml b/.gitea/workflows/build-dev.yml index 138b91a..665f111 100644 --- a/.gitea/workflows/build-dev.yml +++ b/.gitea/workflows/build-dev.yml @@ -1,80 +1,65 @@ name: Build Dev ISOs - on: workflow_dispatch: push: branches: - dev - env: NIX_CONFIG: | extra-substituters = https://attic.radiantwavetech.com/radiantwave-dev extra-trusted-public-keys = radiantwave-dev:B8FhLu3MQ9JfeEIHIKNrKxnP+3akzzkqMbTZR4hRfj0= - jobs: - build-dev-android: - runs-on: build-server - steps: - - name: Clone Repository - run: git clone --depth 1 --no-single-branch ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/KioskConfig.git . - - - name: Checkout dev branch - run: git checkout dev - - - name: Prepare output directory - run: mkdir -p /home/user/radiantwave - - - name: Build dev android ISO - run: | - export NIXPKGS_ALLOW_UNFREE=1 - . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh - nix build -L --impure .#nixosConfigurations.android-dev-iso.config.system.build.isoImage - - - name: Rename dev android ISO - run: | - ISO_DATE=$(date +%Y-%m-%d_%H-%M-%S) - FILENAME="radiantwave-android-dev-${ISO_DATE}.iso" - cp -L result/iso/*.iso "/home/user/radiantwave/${FILENAME}" - echo "FILENAME=${FILENAME}" >> "$GITHUB_ENV" - - - name: Copy dev android ISO to fileserver - run: | - scp "/home/user/radiantwave/${FILENAME}" \ - radiantwave-infra:/mnt/infrastructure_data/files/images/ - - - name: Cleanup - run: rm -f "/home/user/radiantwave/${FILENAME}" - build-dev-kiosk: runs-on: build-server steps: - name: Clone Repository run: git clone --depth 1 --no-single-branch ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/KioskConfig.git . - - name: Checkout dev branch run: git checkout dev - - name: Prepare output directory run: mkdir -p /home/user/radiantwave - - name: Build dev kiosk ISO run: | export NIXPKGS_ALLOW_UNFREE=1 . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh nix build -L --impure .#nixosConfigurations.dev-iso.config.system.build.isoImage - - name: Rename dev kiosk ISO run: | ISO_DATE=$(date +%Y-%m-%d_%H-%M-%S) FILENAME="radiantwave-kiosk-dev-${ISO_DATE}.iso" cp -L result/iso/*.iso "/home/user/radiantwave/${FILENAME}" echo "FILENAME=${FILENAME}" >> "$GITHUB_ENV" - - name: Copy dev kiosk ISO to fileserver run: | scp "/home/user/radiantwave/${FILENAME}" \ radiantwave-infra:/mnt/infrastructure_data/files/images/ + - name: Cleanup + run: rm -f "/home/user/radiantwave/${FILENAME}" + build-dev-android: + runs-on: build-server + steps: + - name: Clone Repository + run: git clone --depth 1 --no-single-branch ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/KioskConfig.git . + - name: Checkout dev branch + run: git checkout dev + - name: Prepare output directory + run: mkdir -p /home/user/radiantwave + - name: Build dev android ISO + run: | + export NIXPKGS_ALLOW_UNFREE=1 + . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh + nix build -L --impure .#nixosConfigurations.android-dev-iso.config.system.build.isoImage + - name: Rename dev android ISO + run: | + ISO_DATE=$(date +%Y-%m-%d_%H-%M-%S) + FILENAME="radiantwave-android-dev-${ISO_DATE}.iso" + cp -L result/iso/*.iso "/home/user/radiantwave/${FILENAME}" + echo "FILENAME=${FILENAME}" >> "$GITHUB_ENV" + - name: Copy dev android ISO to fileserver + run: | + scp "/home/user/radiantwave/${FILENAME}" \ + radiantwave-infra:/mnt/infrastructure_data/files/images/ - name: Cleanup run: rm -f "/home/user/radiantwave/${FILENAME}" @@ -83,30 +68,24 @@ jobs: steps: - name: Clone Repository run: git clone --depth 1 --no-single-branch ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/KioskConfig.git . - - name: Checkout dev branch run: git checkout dev - - name: Prepare output directory run: mkdir -p /home/user/radiantwave - - name: Build dev commercial ISO run: | export NIXPKGS_ALLOW_UNFREE=1 . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh nix build -L --impure .#nixosConfigurations.commercial-dev-iso.config.system.build.isoImage - - name: Rename dev commercial ISO run: | ISO_DATE=$(date +%Y-%m-%d_%H-%M-%S) FILENAME="radiantwave-commercial-dev-${ISO_DATE}.iso" cp -L result/iso/*.iso "/home/user/radiantwave/${FILENAME}" echo "FILENAME=${FILENAME}" >> "$GITHUB_ENV" - - name: Copy dev commercial ISO to fileserver run: | scp "/home/user/radiantwave/${FILENAME}" \ radiantwave-infra:/mnt/infrastructure_data/files/images/ - - name: Cleanup run: rm -f "/home/user/radiantwave/${FILENAME}" diff --git a/UPDATES.md b/UPDATES.md new file mode 100644 index 0000000..4dae974 --- /dev/null +++ b/UPDATES.md @@ -0,0 +1,19 @@ +Implementation complete and verified. Here's what was done: +Implemented (both repos on dev) +Checkpoints (return points if something fails): +- radiantwave → tag pre-live-update @ d84307b +- KioskConfig → tag pre-live-update @ b8d0f59 +radiantwave — .gitea/workflows/dev.yml: Added a "Publish manifest" step after the Attic push. It writes {"version","storePath"} using readlink -f ./result-pkg (the exact closure pushed to the dev Attic), then scps it to radiantwave-infra:/mnt/infrastructure_data/files/radiantwave-dev/manifest.json. main.yml untouched. +KioskConfig: +- New radiantwave-updater.nix module: tmpfiles seed (L /var/lib/radiantwave/current → ), a systemd oneshot service (curl manifest → nix copy --from dev Attic, never builds → atomic mv -T swap), and a 2-min persistent timer. +- flake.nix: imports the module in both builders and enables it on all 4 -dev variants (radiantwavekiosk-dev, -commercial-dev, -android-dev, -rpi-dev) pointing at the dev manifest/attic. +- configuration.nix: launches via /var/lib/radiantwave/current/bin/radiantwave when the updater is enabled; prod keeps /run/current-system/sw/bin/radiantwave. +Verified +- All dev configs evaluate with enable=true; prod enable=false, no updater service/timer, login path unchanged. +- Rendered service script correct (escaped shell vars, resoled Nix ínterps); dev login line + tmpfiles seed rule confirmed. +- All 14 nixosConfigurations evaluate; toplevel dry-run of radiantwavekiosk-dev plans cleanly. +- dev.yml parses as valid YAML with the new step. +Before this actually works end-to-end, you need to +1. Create /mnt/infrastructure_data/files/radiantwave-dev/ on the infra host and confirm it's served as https://files.radiantwavetech.com/radiantwave-dev/manifest.json. +2. Commit + push these changes (I staged radiantwave-updater.nix so nix can see it; nothing is committed yet) — push dev.yml change to radiantwave dev, and the KioskConfig changes to dev. The dev-iso/etc. workflows will then bake the seed in. +Note: git add radiantwave-updater.nix was needed for flake evaluation; the KioskConfig changes are staged but uncommitted. Want me to commit them? \ No newline at end of file diff --git a/temp/computer-direct_to_kiosk.bin b/temp/computer-direct_to_kiosk.bin new file mode 100644 index 0000000000000000000000000000000000000000..3c37dfb7921cb57001f3ee7f65d9c1b71f79700c GIT binary patch literal 256 zcmZSh4+abg9*hi(3=9k+vW(0P%VI0Ids&x<_|8}1^9)()!O(c1v0>$b%?ylC!102? z;8Q_V!-j}1hMHx`3=DEWt^XMejf_o9&CD$<4Y(8(fFgewBAh&cOeg?~{ACaim04iJ z02O4+W@5Ja7?hY09~UbiucWBJB5Y@CBgo9C%*oE)40KNxGY^9TgM|&ywDcRXM;I#_ ym>)6xf6U6v_=ukw(-lls4HAVGx(*RKu26TSDF$o^WRNy+C@@2~6zC8rm$b%?ylC!102? z;8Q_V!-j}1hMHx`3=DEWt^XMejf_o9&CD$<4Y(8(fFgewBAh&cOeg?~{ACaim04iJ z02O4+W@5Ja7?hY09~UbiucWBJB5Y@CBgo9C%*oE)40KNxGY^9TgM|&ywDcRXM;I#_ ym>)6xf6U6v_=ukw(-lls4HAVGx(*RKu26TSDF$o^WRNy+C@@2~6zC8rmI0LAi!C{#d~r=xcdxsArBv*I3pThvTBehw9s{k&~asWz$eJS zAjc@nP!xDUP9aYtl;O}?C!h$#JT&qTgNKW+r$TT+PG(6-Y7wI^6SHK2vw#wdGABEG XGa~~-Dl-p*0K+4OS7;h(#C;6_6a^mv literal 0 HcmV?d00001 diff --git a/temp/root/computer-splitter_out_1-direct_to_kiosk.bin b/temp/root/computer-splitter_out_1-direct_to_kiosk.bin new file mode 100644 index 0000000000000000000000000000000000000000..a9d79a9290b7fe35b121a03b144a1b5931656b53 GIT binary patch literal 256 zcmZSh4+abg9t>b0BFo6!uq?KMyO(u&i0^zAKF^S)9t@2K8XHy~*v!BP1uP{D2A>L| z8a709G1M$eW?+zm=td*|GKh!DERbX1QUC*>>>q{*Cl4qWD8?Ac#BBUAAU-ZuKwe2v zfkoKP)<%$-QJIsSy_u1LA&Z%ZL4m=-MuCCh5ySt-tjvs$`4ST_EoZW7kSMg!b%@Y$ Xg*qoqFLV0_5LELq?zpv0og$b0BFo6!uq?KMyO(u&i0^zAKF^S)9t@2K8XHy~*v!BP1uP{D2A>L| z8a709G1M$eW?+zm=td*|GKh!DERbX1QUC*>>>q{*Cl4qWD8?Ac#BBUAAU-ZuKwe2v zfkoKP)<%$-QJIsSy_u1LA&Z%ZL4m=-MuCCh5ySt-tjvs$`4ST_EoZW7kSMg!b%@Y$ Xg*qoqFLV0_5LELq?zpv0og$