diff options
| -rw-r--r-- | .github/workflows/build-installer-iso.yml | 12 | ||||
| -rw-r--r-- | Justfile | 6 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rwxr-xr-x | just_scripts/build-installer-iso.sh | 2 | ||||
| -rwxr-xr-x | just_scripts/run-installer-iso.sh | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/.github/workflows/build-installer-iso.yml b/.github/workflows/build-installer-iso.yml index 143eafc..1352080 100644 --- a/.github/workflows/build-installer-iso.yml +++ b/.github/workflows/build-installer-iso.yml @@ -1,4 +1,4 @@ -name: Build installer ISO +name: Build Live ISOs on: workflow_dispatch: @@ -18,7 +18,7 @@ concurrency: jobs: build-installer-iso: - name: Build KDE installer ISO + name: Build KDE live ISO runs-on: ubuntu-24.04 permissions: contents: read @@ -102,13 +102,13 @@ jobs: uses: Zeglius/titanoboa@7737f4748458252ac827dca14b3d6dd09298472a # revamp-pr with: image-ref: localhost/aerocore-os-installer:latest - iso-dest: ${{ github.workspace }}/output/aerocore-os-${{ env.ISO_FILE_TAG }}-amd64.iso + iso-dest: ${{ github.workspace }}/output/aerocore-os-${{ env.ISO_FILE_TAG }}-live-amd64.iso - name: Normalize ISO output path shell: bash env: GENERATED_ISO: ${{ steps.build.outputs.iso-dest }} - EXPECTED_ISO: ${{ github.workspace }}/output/aerocore-os-${{ env.ISO_FILE_TAG }}-amd64.iso + EXPECTED_ISO: ${{ github.workspace }}/output/aerocore-os-${{ env.ISO_FILE_TAG }}-live-amd64.iso run: | if [[ ! -f "${GENERATED_ISO}" ]]; then echo "::error::Generated ISO does not exist at ${GENERATED_ISO}" @@ -123,7 +123,7 @@ jobs: shell: bash run: | set -o pipefail - iso_path="output/aerocore-os-${ISO_FILE_TAG}-amd64.iso" + iso_path="output/aerocore-os-${ISO_FILE_TAG}-live-amd64.iso" checksum_path="${iso_path}-CHECKSUM" sha256sum "${iso_path}" | tee "${checksum_path}" { @@ -141,7 +141,7 @@ jobs: shell: bash run: | iso_upload_dir="${{ github.workspace }}/output/upload" - iso_path="${{ github.workspace }}/output/aerocore-os-${ISO_FILE_TAG}-amd64.iso" + iso_path="${{ github.workspace }}/output/aerocore-os-${ISO_FILE_TAG}-live-amd64.iso" iso_name="$(basename "${iso_path}")" mkdir -p "${iso_upload_dir}" @@ -29,7 +29,7 @@ alias rebuild-vm := rebuild-qcow2 alias run-vm := run-vm-qcow2 alias build-installer := build-installer-iso alias run-installer := run-installer-iso -# Backward-compatible aliases; these refer to the installer ISO, not a Live OS. +# Backward-compatible aliases for the Titanoboa live ISO build. alias build-live-iso := build-installer-iso alias run-live-iso := run-installer-iso alias build-live-installer := build-installer-iso @@ -39,11 +39,11 @@ alias run-live-installer := run-installer-iso default: @just --list -# Build the same Titanoboa-based installer ISO as CI +# Build the same Titanoboa-based live ISO as CI build-installer-iso $target_image=("localhost/" + image_name) $tag=default_tag: @IMAGE_NAME="{{ target_image }}" IMAGE_TAG="{{ tag }}" ./just_scripts/build-installer-iso.sh -# Boot the installer ISO with QEMU +# Boot the live ISO with QEMU run-installer-iso: @./just_scripts/run-installer-iso.sh @@ -55,7 +55,7 @@ BASE_IMAGE=ghcr.io/ublue-os/bazzite-deck:testing just build ``` -To build the Bazzite-style installer ISO locally, first build the AeroCore +To build the Bazzite-style live ISO locally, first build the AeroCore image and then run: ```bash @@ -66,5 +66,5 @@ just run-installer-iso This requires privileged Podman, a rootful Podman API socket, `git`, and roughly 70 GiB of free space. Local ISO generation uses the same pinned -Titanoboa builder as the installer workflow, and writes the ISO plus its +Titanoboa builder as the live ISO workflow, and writes the ISO plus its SHA-256 checksum under `output/`. diff --git a/just_scripts/build-installer-iso.sh b/just_scripts/build-installer-iso.sh index 0aacf43..3353651 100755 --- a/just_scripts/build-installer-iso.sh +++ b/just_scripts/build-installer-iso.sh @@ -23,7 +23,7 @@ install_image_ref="${install_image_ref#docker://}" payload="${install_image_ref}:${image_tag}" output_dir="${project_root}/output" payload_archive="${output_dir}/install-payload.oci" -iso="${output_dir}/aerocore-os-${image_tag}-amd64.iso" +iso="${output_dir}/aerocore-os-${image_tag}-live-amd64.iso" checksum="${iso}-CHECKSUM" api_socket="${PODMAN_SOCKET:-/run/podman/podman.sock}" if [[ "${EUID}" -eq 0 ]]; then diff --git a/just_scripts/run-installer-iso.sh b/just_scripts/run-installer-iso.sh index 2c49164..c495215 100755 --- a/just_scripts/run-installer-iso.sh +++ b/just_scripts/run-installer-iso.sh @@ -6,7 +6,7 @@ project_root="$(git rev-parse --show-toplevel)" cd "${project_root}" image_tag="${IMAGE_TAG:-$(just generate-default-tag)}" -iso="${project_root}/output/aerocore-os-${image_tag}-amd64.iso" +iso="${project_root}/output/aerocore-os-${image_tag}-live-amd64.iso" if [[ ! -f "${iso}" ]]; then just build-installer-iso |