Skip to content

Commit 6c257c7

Browse files
committed
fix: update image reference and adjust artifact upload condition in workflows
1 parent 6221f41 commit 6c257c7

2 files changed

Lines changed: 27 additions & 8 deletions

File tree

.github/workflows/reusable-build-iso-anaconda.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
8888
- name: Build ISO
8989
id: build
90-
uses: hanthor/titanoboa@main
90+
uses: ublue-os/titanoboa@main
9191
with:
9292
image-ref: ${{ steps.image_ref.outputs.image_ref }}:${{ matrix.image_version }}
9393
flatpaks-list: ${{ github.workspace }}/iso_files/system-flatpaks.list
@@ -112,7 +112,7 @@ jobs:
112112
echo "output_directory=$OUTPUT_DIRECTORY" >> "${GITHUB_OUTPUT}"
113113
114114
- name: Upload to Job Artifacts
115-
if: github.event_name == 'pull_request'
115+
if: github.ref == 'testing'
116116
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
117117
with:
118118
name: ${{ steps.image_ref.outputs.artifact_format }}

iso_files/configure_lts_iso_anaconda.sh

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
1+
#!/usr/bin/env bash
2+
3+
set -eoux pipefail
4+
5+
IMAGE_INFO="$(cat /usr/share/ublue-os/image-info.json)"
6+
IMAGE_TAG="$(jq -c -r '."image-tag"' <<<"$IMAGE_INFO")"
7+
IMAGE_REF="$(jq -c -r '."image-ref"' <<<"$IMAGE_INFO")"
8+
IMAGE_REF="${IMAGE_REF##*://}"
9+
# sbkey='https://github.com/ublue-os/akmods/raw/main/certs/public_key.der'
10+
11+
# Configure Live Environment
12+
13+
# Remove packages from liveCD to save space
14+
dnf remove -y google-noto-fonts-all ublue-brew ublue-motd yaru-theme || true
15+
16+
# Setup dock
17+
tee /usr/share/glib-2.0/schemas/zz2-org.gnome.shell.gschema.override <<EOF
18+
[org.gnome.shell]
19+
welcome-dialog-last-shown-version='4294967295'
20+
favorite-apps = ['anaconda.desktop', 'documentation.desktop', 'discourse.desktop', 'org.mozilla.firefox.desktop', 'org.gnome.Nautilus.desktop']
121
EOF
222

23+
324
glib-compile-schemas /usr/share/glib-2.0/schemas
425

526
systemctl disable rpm-ostree-countme.service
@@ -67,9 +88,8 @@ menu_auto_hide = True
6788
[Storage]
6889
file_system_type = xfs
6990
default_partitioning =
70-
/ (min 1 GiB, max 70 GiB)
71-
/home (min 500 MiB, free 50 GiB)
72-
/var
91+
/ (min 5 GiB, max 70 GiB)
92+
/var (min 5 GiB)
7393
7494
[User Interface]
7595
custom_stylesheet = /usr/share/anaconda/pixmaps/silverblue/fedora-silverblue.css
@@ -92,8 +112,7 @@ echo "VARIANT_ID=bluefin-lts" >>/usr/lib/os-release
92112
# if [[ "$IMAGE_TAG" =~ gts ]]; then
93113
# echo "Bluefin ${IMAGE_TAG^^} release $VERSION_ID (${VERSION_CODENAME:=Big Bird})" >/etc/system-release
94114
# else
95-
echo "Bluefin release $VERSION_ID Achillobator" >/etc/system-release
96-
fi
115+
echo "Bluefin release $VERSION_ID Achillobator" >/etc/system-release
97116
sed -i 's/ANACONDA_PRODUCTVERSION=.*/ANACONDA_PRODUCTVERSION=""/' /usr/{,s}bin/liveinst || true
98117
sed -i 's|^Icon=.*|Icon=/usr/share/pixmaps/fedora-logo-icon.png|' /usr/share/applications/liveinst.desktop || true
99118
sed -i 's| Fedora| Bluefin|' /usr/share/anaconda/gnome/fedora-welcome || true
@@ -107,7 +126,7 @@ rm -rf /root/packages
107126

108127
# Interactive Kickstart
109128
tee -a /usr/share/anaconda/interactive-defaults.ks <<EOF
110-
ostreecontainer --url=$IMAGE_REF:$IMAGE_TAG --transport=containers-storage --no-signature-verification
129+
ostreecontainer --url=ghcr.io/ublue-os/bluefin:lts --transport=containers-storage --no-signature-verification
111130
%include /usr/share/anaconda/post-scripts/install-configure-upgrade.ks
112131
%include /usr/share/anaconda/post-scripts/install-flatpaks.ks
113132
EOF

0 commit comments

Comments
 (0)