Skip to content
This repository has been archived by the owner on May 8, 2024. It is now read-only.

Commit

Permalink
feat: Update to Fedora 39 and use latest tag (#86)
Browse files Browse the repository at this point in the history
  • Loading branch information
EyeCantCU authored Nov 8, 2023
1 parent 81a36c2 commit 9013ca3
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/shellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
contents: read
runs-on: ubuntu-latest
container:
image: fedora:38
image: fedora:39
options: --privileged
steps:
- name: checkout to execute local action
Expand All @@ -47,7 +47,7 @@ jobs:
id: selftest
with:
image-name: ublue-test
installer-major-version: 38
installer-major-version: 39
installer-repo: releases
boot-menu-path: boot_menu.yml
- name: upload test result as artifact
Expand Down
2 changes: 1 addition & 1 deletion Containerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fedora:38
FROM fedora:39

COPY ./deps.txt /tmp/deps.txt
RUN dnf install \
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Example:
needs: release-please
if: needs.release-please.outputs.releases_created
container:
image: fedora:38
image: fedora:39
options: --privileged
steps:
- uses: actions/checkout@v3
Expand All @@ -28,7 +28,7 @@ Example:
with:
image-name: nameoftheiso
installer-repo: releases
installer-major-version: 38
installer-major-version: 39
- name: install github CLI
run: |
sudo dnf install 'dnf-command(config-manager)' -y
Expand Down
5 changes: 4 additions & 1 deletion generate-installer-media.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ trap cleanup EXIT
# ISO release version and architecture are embedded in .discinfo
xorriso -indev "${INPUT_ISO}" -osirrox on -extract /.discinfo "${WORK_DIR}/.discinfo"

readonly RELEASE="$(sed "2q;d" "${WORK_DIR}/.discinfo")"
RELEASE="$(sed "2q;d" "${WORK_DIR}/.discinfo")"
[[ "${RELEASE}" -eq "39" ]] && RELEASE="latest"
readonly RELEASE

readonly ARCH="$(sed "3q;d" "${WORK_DIR}/.discinfo")"

readonly VOLUME_ID="$(xorriso -indev "${INPUT_ISO}" -pvd_info 2> /dev/null | grep "^Volume Id" | cut -d ":" -f2 | awk '{$1=$1};1')"
Expand Down
7 changes: 5 additions & 2 deletions installer/kickstart/pre-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -oue pipefail

DEFAULT_URL="ghcr.io/ublue-os/silverblue-main:38"
DEFAULT_URL="ghcr.io/ublue-os/silverblue-main:39"

for ARG in `cat /proc/cmdline`; do
if [[ "${ARG}" =~ ^imageurl= ]]; then
Expand All @@ -12,7 +12,10 @@ done

URL=$(echo "${URL:-${DEFAULT_URL}}" | tr "[:upper:]" "[:lower:]")

readonly RELEASE="$(sed "2q;d" "/run/install/repo/.discinfo")"
RELEASE="$(sed "2q;d" "/run/install/repo/.discinfo")"
[[ "${RELEASE}" -eq "39" ]] && RELEASE="latest"
readonly RELEASE

readonly ARCH="$(sed "3q;d" "/run/install/repo/.discinfo")"

cat << EOL > /tmp/ks-urls.txt
Expand Down
3 changes: 2 additions & 1 deletion isopatch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ main() {
xorriso -indev "${INPUT_ISO}" -osirrox on -extract /.discinfo "${WORK_DIR}/.discinfo"

RELEASE="$(sed "2q;d" "${WORK_DIR}/.discinfo")"
[[ "${RELEASE}" -eq "39" ]] && RELEASE="latest"
readonly RELEASE
ARCH="$(sed "3q;d" "${WORK_DIR}/.discinfo")"
readonly ARCH
Expand All @@ -46,7 +47,7 @@ main() {
readonly ESP_IMG

# Prepare overlay
patch_grub_cfg
patch_grub_cfg
generate_ks
copy_secure_boot_keys

Expand Down

0 comments on commit 9013ca3

Please sign in to comment.