Dev #9

Merged
NeilClack merged 4 commits from dev into main 2026-10-01 22:28:48 +00:00
5 changed files with 28 additions and 28 deletions
Showing only changes of commit cac2e455ec - Show all commits
+12 -12
View File
@@ -17,7 +17,7 @@ jobs:
- name: Checkout dev branch - name: Checkout dev branch
run: git checkout dev run: git checkout dev
- name: Prepare output directory - name: Prepare output directory
run: mkdir -p /home/user/radiantwave run: mkdir -p /var/lib/gitea-runner/radiantwave
- name: Build dev kiosk ISO - name: Build dev kiosk ISO
run: | run: |
export NIXPKGS_ALLOW_UNFREE=1 export NIXPKGS_ALLOW_UNFREE=1
@@ -27,14 +27,14 @@ jobs:
run: | run: |
ISO_DATE=$(date +%Y-%m-%d_%H-%M-%S) ISO_DATE=$(date +%Y-%m-%d_%H-%M-%S)
FILENAME="radiantwave-kiosk-dev-${ISO_DATE}.iso" FILENAME="radiantwave-kiosk-dev-${ISO_DATE}.iso"
cp -L result/iso/*.iso "/home/user/radiantwave/${FILENAME}" cp -L result/iso/*.iso "/var/lib/gitea-runner/radiantwave/${FILENAME}"
echo "FILENAME=${FILENAME}" >> "$GITHUB_ENV" echo "FILENAME=${FILENAME}" >> "$GITHUB_ENV"
- name: Copy dev kiosk ISO to fileserver - name: Copy dev kiosk ISO to fileserver
run: | run: |
scp "/home/user/radiantwave/${FILENAME}" \ scp "/var/lib/gitea-runner/radiantwave/${FILENAME}" \
radiantwave-infra:/mnt/infrastructure_data/files/images/ radiantwave-infra:/mnt/infrastructure_data/files/images/
- name: Cleanup - name: Cleanup
run: rm -f "/home/user/radiantwave/${FILENAME}" run: rm -f "/var/lib/gitea-runner/radiantwave/${FILENAME}"
build-dev-android: build-dev-android:
runs-on: orion-lxc runs-on: orion-lxc
@@ -44,7 +44,7 @@ jobs:
- name: Checkout dev branch - name: Checkout dev branch
run: git checkout dev run: git checkout dev
- name: Prepare output directory - name: Prepare output directory
run: mkdir -p /home/user/radiantwave run: mkdir -p /var/lib/gitea-runner/radiantwave
- name: Build dev android ISO - name: Build dev android ISO
run: | run: |
export NIXPKGS_ALLOW_UNFREE=1 export NIXPKGS_ALLOW_UNFREE=1
@@ -54,14 +54,14 @@ jobs:
run: | run: |
ISO_DATE=$(date +%Y-%m-%d_%H-%M-%S) ISO_DATE=$(date +%Y-%m-%d_%H-%M-%S)
FILENAME="radiantwave-android-dev-${ISO_DATE}.iso" FILENAME="radiantwave-android-dev-${ISO_DATE}.iso"
cp -L result/iso/*.iso "/home/user/radiantwave/${FILENAME}" cp -L result/iso/*.iso "/var/lib/gitea-runner/radiantwave/${FILENAME}"
echo "FILENAME=${FILENAME}" >> "$GITHUB_ENV" echo "FILENAME=${FILENAME}" >> "$GITHUB_ENV"
- name: Copy dev android ISO to fileserver - name: Copy dev android ISO to fileserver
run: | run: |
scp "/home/user/radiantwave/${FILENAME}" \ scp "/var/lib/gitea-runner/radiantwave/${FILENAME}" \
radiantwave-infra:/mnt/infrastructure_data/files/images/ radiantwave-infra:/mnt/infrastructure_data/files/images/
- name: Cleanup - name: Cleanup
run: rm -f "/home/user/radiantwave/${FILENAME}" run: rm -f "/var/lib/gitea-runner/radiantwave/${FILENAME}"
build-dev-commercial: build-dev-commercial:
runs-on: orion-lxc runs-on: orion-lxc
@@ -71,7 +71,7 @@ jobs:
- name: Checkout dev branch - name: Checkout dev branch
run: git checkout dev run: git checkout dev
- name: Prepare output directory - name: Prepare output directory
run: mkdir -p /home/user/radiantwave run: mkdir -p /var/lib/gitea-runner/radiantwave
- name: Build dev commercial ISO - name: Build dev commercial ISO
run: | run: |
export NIXPKGS_ALLOW_UNFREE=1 export NIXPKGS_ALLOW_UNFREE=1
@@ -81,11 +81,11 @@ jobs:
run: | run: |
ISO_DATE=$(date +%Y-%m-%d_%H-%M-%S) ISO_DATE=$(date +%Y-%m-%d_%H-%M-%S)
FILENAME="radiantwave-commercial-dev-${ISO_DATE}.iso" FILENAME="radiantwave-commercial-dev-${ISO_DATE}.iso"
cp -L result/iso/*.iso "/home/user/radiantwave/${FILENAME}" cp -L result/iso/*.iso "/var/lib/gitea-runner/radiantwave/${FILENAME}"
echo "FILENAME=${FILENAME}" >> "$GITHUB_ENV" echo "FILENAME=${FILENAME}" >> "$GITHUB_ENV"
- name: Copy dev commercial ISO to fileserver - name: Copy dev commercial ISO to fileserver
run: | run: |
scp "/home/user/radiantwave/${FILENAME}" \ scp "/var/lib/gitea-runner/radiantwave/${FILENAME}" \
radiantwave-infra:/mnt/infrastructure_data/files/images/ radiantwave-infra:/mnt/infrastructure_data/files/images/
- name: Cleanup - name: Cleanup
run: rm -f "/home/user/radiantwave/${FILENAME}" run: rm -f "/var/lib/gitea-runner/radiantwave/${FILENAME}"
+4 -4
View File
@@ -18,7 +18,7 @@ jobs:
run: git clone --depth 1 ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/KioskConfig.git . run: git clone --depth 1 ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/KioskConfig.git .
- name: Prepare output directory - name: Prepare output directory
run: mkdir -p /home/user/radiantwave run: mkdir -p /var/lib/gitea-runner/radiantwave
- name: Build android kiosk ISO - name: Build android kiosk ISO
run: | run: |
@@ -30,13 +30,13 @@ jobs:
run: | run: |
ISO_DATE=$(date +%Y-%m-%d_%H-%M-%S) ISO_DATE=$(date +%Y-%m-%d_%H-%M-%S)
FILENAME="radiantwave-android-iso-${ISO_DATE}.iso" FILENAME="radiantwave-android-iso-${ISO_DATE}.iso"
cp -L result/iso/*.iso "/home/user/radiantwave/${FILENAME}" cp -L result/iso/*.iso "/var/lib/gitea-runner/radiantwave/${FILENAME}"
echo "ANDROID_ISO_FILENAME=${FILENAME}" >> "$GITHUB_ENV" echo "ANDROID_ISO_FILENAME=${FILENAME}" >> "$GITHUB_ENV"
- name: Copy android kiosk ISO to fileserver - name: Copy android kiosk ISO to fileserver
run: | run: |
scp "/home/user/radiantwave/${ANDROID_ISO_FILENAME}" \ scp "/var/lib/gitea-runner/radiantwave/${ANDROID_ISO_FILENAME}" \
radiantwave-infra:/mnt/infrastructure_data/files/images/ radiantwave-infra:/mnt/infrastructure_data/files/images/
- name: Cleanup android kiosk ISO - name: Cleanup android kiosk ISO
run: rm -f "/home/user/radiantwave/${ANDROID_ISO_FILENAME}" run: rm -f "/var/lib/gitea-runner/radiantwave/${ANDROID_ISO_FILENAME}"
+4 -4
View File
@@ -18,7 +18,7 @@ jobs:
run: git clone --depth 1 ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/KioskConfig.git . run: git clone --depth 1 ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/KioskConfig.git .
- name: Prepare output directory - name: Prepare output directory
run: mkdir -p /home/user/radiantwave run: mkdir -p /var/lib/gitea-runner/radiantwave
- name: Build commercial kiosk ISO - name: Build commercial kiosk ISO
run: | run: |
@@ -30,13 +30,13 @@ jobs:
run: | run: |
ISO_DATE=$(date +%Y-%m-%d_%H-%M-%S) ISO_DATE=$(date +%Y-%m-%d_%H-%M-%S)
FILENAME="radiantwave-commercial-iso-${ISO_DATE}.iso" FILENAME="radiantwave-commercial-iso-${ISO_DATE}.iso"
cp -L result/iso/*.iso "/home/user/radiantwave/${FILENAME}" cp -L result/iso/*.iso "/var/lib/gitea-runner/radiantwave/${FILENAME}"
echo "COMMERCIAL_ISO_FILENAME=${FILENAME}" >> "$GITHUB_ENV" echo "COMMERCIAL_ISO_FILENAME=${FILENAME}" >> "$GITHUB_ENV"
- name: Copy commercial kiosk ISO to fileserver - name: Copy commercial kiosk ISO to fileserver
run: | run: |
scp "/home/user/radiantwave/${COMMERCIAL_ISO_FILENAME}" \ scp "/var/lib/gitea-runner/radiantwave/${COMMERCIAL_ISO_FILENAME}" \
radiantwave-infra:/mnt/infrastructure_data/files/images/ radiantwave-infra:/mnt/infrastructure_data/files/images/
- name: Cleanup commercial kiosk ISO - name: Cleanup commercial kiosk ISO
run: rm -f "/home/user/radiantwave/${COMMERCIAL_ISO_FILENAME}" run: rm -f "/var/lib/gitea-runner/radiantwave/${COMMERCIAL_ISO_FILENAME}"
+4 -4
View File
@@ -18,7 +18,7 @@ jobs:
run: git clone --depth 1 ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/KioskConfig.git . run: git clone --depth 1 ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/KioskConfig.git .
- name: Prepare output directory - name: Prepare output directory
run: mkdir -p /home/user/radiantwave run: mkdir -p /var/lib/gitea-runner/radiantwave
- name: Build kiosk ISO - name: Build kiosk ISO
run: | run: |
@@ -30,13 +30,13 @@ jobs:
run: | run: |
ISO_DATE=$(date +%Y-%m-%d_%H-%M-%S) ISO_DATE=$(date +%Y-%m-%d_%H-%M-%S)
FILENAME="radiantwave-home-${ISO_DATE}.iso" FILENAME="radiantwave-home-${ISO_DATE}.iso"
cp -L result/iso/*.iso "/home/user/radiantwave/${FILENAME}" cp -L result/iso/*.iso "/var/lib/gitea-runner/radiantwave/${FILENAME}"
echo "KIOSK_ISO_FILENAME=${FILENAME}" >> "$GITHUB_ENV" echo "KIOSK_ISO_FILENAME=${FILENAME}" >> "$GITHUB_ENV"
- name: Copy kiosk ISO to fileserver - name: Copy kiosk ISO to fileserver
run: | run: |
scp "/home/user/radiantwave/${KIOSK_ISO_FILENAME}" \ scp "/var/lib/gitea-runner/radiantwave/${KIOSK_ISO_FILENAME}" \
radiantwave-infra:/mnt/infrastructure_data/files/images/ radiantwave-infra:/mnt/infrastructure_data/files/images/
- name: Cleanup kiosk ISO - name: Cleanup kiosk ISO
run: rm -f "/home/user/radiantwave/${KIOSK_ISO_FILENAME}" run: rm -f "/var/lib/gitea-runner/radiantwave/${KIOSK_ISO_FILENAME}"
+4 -4
View File
@@ -15,7 +15,7 @@ jobs:
run: git clone --depth 1 ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/KioskConfig.git . run: git clone --depth 1 ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/KioskConfig.git .
- name: Prepare output directory - name: Prepare output directory
run: mkdir -p /home/user/radiantwave run: mkdir -p /var/lib/gitea-runner/radiantwave
- name: Build Raspberry Pi image - name: Build Raspberry Pi image
run: | run: |
@@ -27,13 +27,13 @@ jobs:
run: | run: |
ISO_DATE=$(date +%Y-%m-%d_%H-%M-%S) ISO_DATE=$(date +%Y-%m-%d_%H-%M-%S)
FILENAME="radiantwave-rpi-${ISO_DATE}.img.zst" FILENAME="radiantwave-rpi-${ISO_DATE}.img.zst"
cp -L result/sd-image/*.img.zst "/home/user/radiantwave/${FILENAME}" cp -L result/sd-image/*.img.zst "/var/lib/gitea-runner/radiantwave/${FILENAME}"
echo "RPI_IMAGE_FILENAME=${FILENAME}" >> "$GITHUB_ENV" echo "RPI_IMAGE_FILENAME=${FILENAME}" >> "$GITHUB_ENV"
- name: Copy Raspberry Pi image to fileserver - name: Copy Raspberry Pi image to fileserver
run: | run: |
scp "/home/user/radiantwave/${RPI_IMAGE_FILENAME}" \ scp "/var/lib/gitea-runner/radiantwave/${RPI_IMAGE_FILENAME}" \
radiantwave-infra:/mnt/infrastructure_data/files/images/ radiantwave-infra:/mnt/infrastructure_data/files/images/
- name: Cleanup Raspberry Pi image - name: Cleanup Raspberry Pi image
run: rm -f "/home/user/radiantwave/${RPI_IMAGE_FILENAME}" run: rm -f "/var/lib/gitea-runner/radiantwave/${RPI_IMAGE_FILENAME}"