Karl/AnotterKiosk
1
0
Fork 0
mirror of https://github.com/karl0ss/AnotterKiosk.git synced 2025-04-29 10:53:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use better release filenames

Browse Source
This commit is contained in:
Manawyrm 2023-06-30 14:35:02 +02:00
parent b207970732
commit ee0e38aee0
4 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/raspberrypi.yml vendored
View File

@ -28,21 +28,13 @@ jobs:
run: | run: |
./build_raspberry_pi.sh ./build_raspberry_pi.sh
- name: Compress firmware
run: |
pigz -9 raspikiosk.img
- name: Debug info
run: |
ls -lAh .
- name: Release build artifacts - name: Release build artifacts
uses: softprops/action-gh-release@v1 uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/') if: startsWith(github.ref, 'refs/tags/')
with: with:
append_body: true append_body: true
body_path: ./raspikiosk.version body_path: ./version-info
files: | files: |
./raspikiosk.img.gz ./anotterkiosk-*
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

12
.github/workflows/x86.yml vendored
View File

@ -28,21 +28,13 @@ jobs:
run: | run: |
./build_x86.sh ./build_x86.sh
- name: Compress firmware
run: |
pigz -4 x86kiosk.img
- name: Debug info
run: |
ls -lAh .
- name: Release build artifacts - name: Release build artifacts
uses: softprops/action-gh-release@v1 uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/') if: startsWith(github.ref, 'refs/tags/')
with: with:
append_body: true append_body: true
body_path: ./x86kiosk.version body_path: ./version-info
files: | files: |
./x86kiosk.img.gz ./anotterkiosk-*
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

9
build_raspberry_pi.sh
View File

@ -51,9 +51,8 @@ sed -i 's/vfat defaults/vfat ro,defaults/g' "${BUILD_DIR}/etc/fstab"
sed -i 's/ext4 defaults/ext4 ro,defaults/g' "${BUILD_DIR}/etc/fstab" sed -i 's/ext4 defaults/ext4 ro,defaults/g' "${BUILD_DIR}/etc/fstab"
# Include git repo version info # Include git repo version info
echo -n "AnotterKiosk repository version: " > "${BUILD_DIR}/version-info" echo -n "AnotterKiosk Raspberry Pi version: " > "${BUILD_DIR}/version-info"
git describe --abbrev=4 --dirty --always --tags >> "${BUILD_DIR}/version-info" git describe --abbrev=4 --dirty --always --tags >> "${BUILD_DIR}/version-info"
echo >> "${BUILD_DIR}/version-info"
# Mount system partitions (from the build host) # Mount system partitions (from the build host)
sudo mount proc -t proc -o nosuid,noexec,nodev "${BUILD_DIR}/proc/" sudo mount proc -t proc -o nosuid,noexec,nodev "${BUILD_DIR}/proc/"
@ -69,7 +68,7 @@ sudo chroot "${BUILD_DIR}" /kiosk_skeleton/build.sh
sudo rm -r "${BUILD_DIR}/kiosk_skeleton" sudo rm -r "${BUILD_DIR}/kiosk_skeleton"
sudo rm "${BUILD_DIR}/raspberry_pi_bullseye.sh" sudo rm "${BUILD_DIR}/raspberry_pi_bullseye.sh"
cp "${BUILD_DIR}/version-info" raspikiosk.version cp "${BUILD_DIR}/version-info" version-info
sudo umount -fl "${BUILD_DIR}/proc" sudo umount -fl "${BUILD_DIR}/proc"
sudo umount -fl "${BUILD_DIR}/sys" sudo umount -fl "${BUILD_DIR}/sys"
@ -83,3 +82,7 @@ sudo umount "${BUILD_DIR}/boot"
sudo umount "${BUILD_DIR}" sudo umount "${BUILD_DIR}"
sudo losetup -D /dev/loop0 sudo losetup -D /dev/loop0
tag=$(git describe --abbrev=4 --dirty --always --tags)
mv raspikiosk.img anotterkiosk-${tag}-arm64-raspberrypi.img
pigz -4 anotterkiosk-${tag}-arm64-raspberrypi.img

13
build_x86.sh
View File

@ -33,8 +33,8 @@ echo "${PARTLAYOUT}" | sfdisk x86kiosk.img
ld=$(sudo losetup -P --show -f x86kiosk.img) ld=$(sudo losetup -P --show -f x86kiosk.img)
# Create filesystems # Create filesystems
mkfs.ext4 "${ld}p2" sudo mkfs.ext4 "${ld}p2"
mkfs.fat -F 32 "${ld}p1" sudo mkfs.fat -F 32 "${ld}p1"
# Mount partitions # Mount partitions
sudo mount "${ld}p2" "${BUILD_DIR}" sudo mount "${ld}p2" "${BUILD_DIR}"
@ -56,9 +56,8 @@ echo "UUID=${fat_uuid} /boot vfat ro,defaults 0 2"
echo "UUID=${ext_uuid} / ext4 ro,defaults,noatime 0 1" | sudo tee -a "${BUILD_DIR}/etc/fstab" echo "UUID=${ext_uuid} / ext4 ro,defaults,noatime 0 1" | sudo tee -a "${BUILD_DIR}/etc/fstab"
# Include git repo version info # Include git repo version info
echo -n "AnotterKiosk repository version: " > "${BUILD_DIR}/version-info" echo -n "AnotterKiosk x86 version: " > "${BUILD_DIR}/version-info"
git describe --abbrev=4 --dirty --always --tags >> "${BUILD_DIR}/version-info" git describe --abbrev=4 --dirty --always --tags >> "${BUILD_DIR}/version-info"
echo >> "${BUILD_DIR}/version-info"
# Mount system partitions (from the build host) # Mount system partitions (from the build host)
sudo mount proc -t proc -o nosuid,noexec,nodev "${BUILD_DIR}/proc/" sudo mount proc -t proc -o nosuid,noexec,nodev "${BUILD_DIR}/proc/"
@ -71,7 +70,7 @@ sudo chroot "${BUILD_DIR}" /kiosk_skeleton/build.sh
sudo rm -r "${BUILD_DIR}/kiosk_skeleton" sudo rm -r "${BUILD_DIR}/kiosk_skeleton"
cp "${BUILD_DIR}/version-info" x86kiosk.version cp "${BUILD_DIR}/version-info" version-info
sudo umount -fl "${BUILD_DIR}/proc" sudo umount -fl "${BUILD_DIR}/proc"
sudo umount -fl "${BUILD_DIR}/sys" sudo umount -fl "${BUILD_DIR}/sys"
@ -85,3 +84,7 @@ sudo umount "${BUILD_DIR}/boot"
sudo umount "${BUILD_DIR}" sudo umount "${BUILD_DIR}"
sudo losetup -D "${ld}" sudo losetup -D "${ld}"
tag=$(git describe --abbrev=4 --dirty --always --tags)
mv x86kiosk.img anotterkiosk-${tag}-x86.img
pigz -4 anotterkiosk-${tag}-x86.img