summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/build-installer-iso.yml (renamed from .github/workflows/build-live-installer.yml)28
-rw-r--r--.github/workflows/validate-installer-iso.yml (renamed from .github/workflows/validate-live-installer.yml)12
2 files changed, 16 insertions, 24 deletions
diff --git a/.github/workflows/build-live-installer.yml b/.github/workflows/build-installer-iso.yml
index 0965c33..f7897b9 100644
--- a/.github/workflows/build-live-installer.yml
+++ b/.github/workflows/build-installer-iso.yml
@@ -1,4 +1,4 @@
-name: Build live installer
+name: Build installer ISO
on:
workflow_dispatch:
@@ -9,13 +9,6 @@ on:
default: latest
type: string
workflow_call:
- workflow_run:
- workflows:
- - Build container image
- types:
- - completed
- branches:
- - main
permissions: {}
@@ -24,9 +17,8 @@ concurrency:
cancel-in-progress: true
jobs:
- build-live-installer:
- name: Build KDE live installer
- if: github.event_name != 'workflow_run' || (github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'push')
+ build-installer-iso:
+ name: Build KDE installer ISO
runs-on: ubuntu-24.04
permissions:
contents: read
@@ -77,24 +69,24 @@ jobs:
run: |
sudo podman pull "${IMAGE_REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}"
- - name: Build live installer payload
+ - name: Build installer ISO payload
run: |
mkdir -p output
sudo podman tag \
"${IMAGE_REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}" \
- localhost/aerocore-live-payload:latest
+ localhost/aerocore-os-installer:latest
sudo podman save \
--format oci-archive \
--output output/install-payload.oci \
- localhost/aerocore-live-payload:latest
+ localhost/aerocore-os-installer:latest
sudo podman build \
--cap-add sys_admin \
--security-opt label=disable \
--build-arg "BASE_IMAGE=${LIVE_BASE_IMAGE}" \
- --build-arg "INSTALL_IMAGE_PAYLOAD=localhost/aerocore-live-payload:latest" \
+ --build-arg "INSTALL_IMAGE_PAYLOAD=localhost/aerocore-os-installer:latest" \
--build-arg "INSTALL_IMAGE_PAYLOAD_ARCHIVE=/install-payload.oci" \
- --tag localhost/aerocore-live-payload:latest \
+ --tag localhost/aerocore-os-installer:latest \
--file installer/Containerfile \
.
@@ -102,7 +94,7 @@ jobs:
id: build
uses: Zeglius/titanoboa@7737f4748458252ac827dca14b3d6dd09298472a # revamp-pr
with:
- image-ref: localhost/aerocore-live-payload:latest
+ image-ref: localhost/aerocore-os-installer:latest
iso-dest: ${{ github.workspace }}/output/aerocore-os-${{ env.ISO_FILE_TAG }}-amd64.iso
- name: Normalize ISO output path
@@ -157,7 +149,7 @@ jobs:
if: github.ref_name == 'testing'
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
with:
- name: aerocore-os-live-installer-${{ env.ISO_FILE_TAG }}-checksum
+ name: aerocore-os-installer-iso-${{ env.ISO_FILE_TAG }}-checksum
path: ${{ steps.upload-directory.outputs.iso-upload-dir }}/*-CHECKSUM
if-no-files-found: error
retention-days: 1
diff --git a/.github/workflows/validate-live-installer.yml b/.github/workflows/validate-installer-iso.yml
index 3d35a5d..37f5496 100644
--- a/.github/workflows/validate-live-installer.yml
+++ b/.github/workflows/validate-installer-iso.yml
@@ -1,20 +1,20 @@
-name: Validate live installer
+name: Validate installer ISO
on:
pull_request:
paths:
- "Justfile"
- "installer/**"
- - "just_scripts/build-live-installer.sh"
- - ".github/workflows/build-live-installer.yml"
- - ".github/workflows/validate-live-installer.yml"
+ - "just_scripts/build-installer-iso.sh"
+ - ".github/workflows/build-installer-iso.yml"
+ - ".github/workflows/validate-installer-iso.yml"
permissions:
contents: read
jobs:
- validate-live-installer:
- name: Validate live installer inputs
+ validate-installer-iso:
+ name: Validate installer ISO inputs
runs-on: ubuntu-24.04
steps: