From c1ad4a9767260673fcf3d5236c1805b4f9afb2a1 Mon Sep 17 00:00:00 2001 From: NeilClack Date: Tue, 25 Aug 2026 21:49:09 -0500 Subject: [PATCH] Remove archive steps... --- .gitea/workflows/build-dev.yml | 75 ++++++++++------------ .gitea/workflows/build-prod-android.yml | 4 -- .gitea/workflows/build-prod-commercial.yml | 4 -- .gitea/workflows/build-prod-kiosk.yml | 4 -- .gitea/workflows/build-prod-rpi.yml | 3 - 5 files changed, 33 insertions(+), 57 deletions(-) diff --git a/.gitea/workflows/build-dev.yml b/.gitea/workflows/build-dev.yml index f22773e..138b91a 100644 --- a/.gitea/workflows/build-dev.yml +++ b/.gitea/workflows/build-dev.yml @@ -12,6 +12,39 @@ env: 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: @@ -37,9 +70,6 @@ jobs: cp -L result/iso/*.iso "/home/user/radiantwave/${FILENAME}" echo "FILENAME=${FILENAME}" >> "$GITHUB_ENV" - - name: Move old dev kiosk images to archive - run: tools/archive-images.sh nclack@157.245.124.103 /mnt/infrastructure_data/files/images /mnt/infrastructure_data/files/images/archives 'radiantwave-kiosk-dev*' - - name: Copy dev kiosk ISO to fileserver run: | scp "/home/user/radiantwave/${FILENAME}" \ @@ -73,9 +103,6 @@ jobs: cp -L result/iso/*.iso "/home/user/radiantwave/${FILENAME}" echo "FILENAME=${FILENAME}" >> "$GITHUB_ENV" - - name: Move old dev commercial images to archive - run: tools/archive-images.sh nclack@157.245.124.103 /mnt/infrastructure_data/files/images /mnt/infrastructure_data/files/images/archives 'radiantwave-commercial-dev*' - - name: Copy dev commercial ISO to fileserver run: | scp "/home/user/radiantwave/${FILENAME}" \ @@ -83,39 +110,3 @@ jobs: - 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: Move old dev android images to archive - run: tools/archive-images.sh nclack@157.245.124.103 /mnt/infrastructure_data/files/images /mnt/infrastructure_data/files/images/archives 'radiantwave-android-dev*' - - - 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}" diff --git a/.gitea/workflows/build-prod-android.yml b/.gitea/workflows/build-prod-android.yml index 7b4912f..3770704 100644 --- a/.gitea/workflows/build-prod-android.yml +++ b/.gitea/workflows/build-prod-android.yml @@ -33,10 +33,6 @@ jobs: cp -L result/iso/*.iso "/home/user/radiantwave/${FILENAME}" echo "ANDROID_ISO_FILENAME=${FILENAME}" >> "$GITHUB_ENV" - # - name: Move old android images to archive - # run: | - # ssh nclack@157.245.124.103 'mv /mnt/infrastructure_data/files/images/radiantwave-android-iso* /mnt/infrastructure_data/files/images/archives/' - - name: Copy android kiosk ISO to fileserver run: | scp "/home/user/radiantwave/${ANDROID_ISO_FILENAME}" \ diff --git a/.gitea/workflows/build-prod-commercial.yml b/.gitea/workflows/build-prod-commercial.yml index d130db4..59134d1 100644 --- a/.gitea/workflows/build-prod-commercial.yml +++ b/.gitea/workflows/build-prod-commercial.yml @@ -33,10 +33,6 @@ jobs: cp -L result/iso/*.iso "/home/user/radiantwave/${FILENAME}" echo "COMMERCIAL_ISO_FILENAME=${FILENAME}" >> "$GITHUB_ENV" - # - name: Move old commercial images to archive - # run: | - # ssh nclack@157.245.124.103 'mv /mnt/infrastructure_data/files/images/radiantwave-commercial-iso* /mnt/infrastructure_data/files/images/archives/' - - name: Copy commercial kiosk ISO to fileserver run: | scp "/home/user/radiantwave/${COMMERCIAL_ISO_FILENAME}" \ diff --git a/.gitea/workflows/build-prod-kiosk.yml b/.gitea/workflows/build-prod-kiosk.yml index 8a5d69d..e5e89ef 100644 --- a/.gitea/workflows/build-prod-kiosk.yml +++ b/.gitea/workflows/build-prod-kiosk.yml @@ -33,10 +33,6 @@ jobs: cp -L result/iso/*.iso "/home/user/radiantwave/${FILENAME}" echo "KIOSK_ISO_FILENAME=${FILENAME}" >> "$GITHUB_ENV" - # - name: Move old kiosk images to archive - # run: | - # ssh nclack@157.245.124.103 'mv /mnt/infrastructure_data/files/images/radiantwave-home* /mnt/infrastructure_data/files/images/archives/' - - name: Copy kiosk ISO to fileserver run: | scp "/home/user/radiantwave/${KIOSK_ISO_FILENAME}" \ diff --git a/.gitea/workflows/build-prod-rpi.yml b/.gitea/workflows/build-prod-rpi.yml index bb267ce..609ac5e 100644 --- a/.gitea/workflows/build-prod-rpi.yml +++ b/.gitea/workflows/build-prod-rpi.yml @@ -30,9 +30,6 @@ jobs: cp -L result/sd-image/*.img.zst "/home/user/radiantwave/${FILENAME}" echo "RPI_IMAGE_FILENAME=${FILENAME}" >> "$GITHUB_ENV" - - name: Move old Raspberry Pi images to archive - run: tools/archive-images.sh nclack@157.245.124.103 /mnt/infrastructure_data/files/images /mnt/infrastructure_data/files/images/archives 'radiantwave-rpi*' - - name: Copy Raspberry Pi image to fileserver run: | scp "/home/user/radiantwave/${RPI_IMAGE_FILENAME}" \