Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 26 additions & 17 deletions .github/workflows/reusable-build-iso-anaconda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,21 +56,17 @@ jobs:
repository: get-aurora-dev/common
path: common

- name: Setup Just
uses: extractions/setup-just@53165ef7e734c5c07cb06b3c8e7b647c5aa16db3 # v4

- name: Check Just Syntax
shell: bash
run: |
just check

- name: Format image ref
id: image_ref
env:
FLAVOR: ${{ matrix.flavor }}
run: |
set -eoux pipefail
image_name=$(just image_name "aurora" "${{ matrix.image_version}}" "${{ matrix.flavor}}")
if [[ "${{ matrix.flavor }}" =~ main ]]; then
image_name="aurora"
else
image_name="aurora-${{ matrix.flavor }}"
fi
image_ref="${IMAGE_REGISTRY}/${image_name}"
KARGS="NONE"
echo "image_ref=$image_ref" >> "${GITHUB_OUTPUT}"
Expand All @@ -81,18 +77,31 @@ jobs:
id: flatpak_list
run: |
set -eoux pipefail
FILE_LIST="$(mktemp)"
cat common/system_files/shared/usr/share/ublue-os/homebrew/system-flatpaks.Brewfile | grep -v '#' | grep -F -e "flatpak" | sed 's/flatpak //' | tr -d '"' | tee "${FILE_LIST}"
echo "file_list_path=${FILE_LIST}" | tee "${GITHUB_OUTPUT}"
mkdir -p iso_files
cat common/system_files/shared/usr/share/ublue-os/homebrew/system-flatpaks.Brewfile | grep -v '#' | grep -F -e "flatpak" | sed 's/flatpak //' | tr -d '"' | tee iso_files/flatpaks.list

- name: Pull base image
run: |
sudo podman pull "${{ steps.image_ref.outputs.image_ref }}:${{ matrix.image_version }}"

- name: Build Live Container Image
id: build-container
run: |
IMAGE_NAME="aurora-live-${{ matrix.flavor }}:${{ matrix.image_version }}"
sudo podman build \
--cap-add sys_admin \
--security-opt label=disable \
--build-arg BASE_IMAGE=${{ steps.image_ref.outputs.image_ref }}:${{ matrix.image_version }} \
--tag "${IMAGE_NAME}" \
-f Containerfile \
.
echo "image_name=${IMAGE_NAME}" >> "${GITHUB_OUTPUT}"

- name: Build ISO
id: build
uses: ublue-os/titanoboa@840217d97bd0bc9a52466508c54d8dda5c5ba2fd
uses: ublue-os/titanoboa@5c457c3d0518bd17e754be0fd98a60d29d26abb4
with:
image-ref: ${{ steps.image_ref.outputs.image_ref }}:${{ matrix.image_version }}
flatpaks-list: ${{ steps.flatpak_list.outputs.file_list_path }}
hook-post-rootfs: ${{ github.workspace }}/${{ inputs.hook_script }}
kargs: ${{ steps.image_ref.outputs.kargs }}
image-ref: ${{ steps.build-container.outputs.image_name }}

- name: Rename ISO
id: rename
Expand Down
28 changes: 0 additions & 28 deletions .github/workflows/validate-just.yml

This file was deleted.

3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,3 @@ __pycache__/
.pytest_cache/
venv/
env/

# Just
.just/
Loading