From 546a9cdf06364536c80d8fa721daa0b9c529cb27 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sat, 24 Feb 2024 20:55:25 -0800 Subject: [PATCH 01/24] chore(ci): Various build fixes chore: Update version of flatpak and hardware setup scripts --- Containerfile | 24 +++++++++++++------ .../usr/libexec/bazzite-flatpak-manager | 2 +- .../shared/usr/libexec/bazzite-hardware-setup | 2 +- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/Containerfile b/Containerfile index ca919f8f..83e95490 100644 --- a/Containerfile +++ b/Containerfile @@ -181,25 +181,33 @@ RUN rpm-ostree override replace \ --from repo=updates \ libmount \ || true && \ + rpm-ostree override replace \ + --experimental \ + --from repo=updates \ + cups-libs \ + || true && \ rpm-ostree override remove \ glibc32 \ || true # Install Valve's patched Mesa # Install patched switcheroo control with proper discrete GPU support -RUN rpm-ostree override replace \ +RUN rpm-ostree override remove \ + mesa-va-drivers-freeworld && \ + rpm-ostree override replace \ --experimental \ --from repo=copr:copr.fedorainfracloud.org:kylegospo:bazzite-multilib \ mesa-filesystem \ - mesa-dri-drivers \ - mesa-libEGL \ - mesa-libgbm \ - mesa-libGL \ + mesa-libxatracker \ mesa-libglapi \ + mesa-dri-drivers \ + mesa-libgbm \ + mesa-libEGL \ mesa-vulkan-drivers \ - mesa-libOSMesa \ + mesa-libGL \ xorg-x11-server-Xwayland && \ rpm-ostree install \ + mesa-va-drivers-freeworld \ mesa-vdpau-drivers-freeworld.x86_64 && \ rpm-ostree override replace \ --experimental \ @@ -367,8 +375,10 @@ RUN rpm-ostree install \ gamemode \ ; else \ rpm-ostree override remove \ - gamemode \ + gamemode && \ + rpm-ostree override remove \ gnome-shell-extension-gamemode \ + || true \ ; fi && \ sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/winetricks.desktop && \ ln -s /usr/bin/wine64 /usr/bin/wine && \ diff --git a/system_files/desktop/shared/usr/libexec/bazzite-flatpak-manager b/system_files/desktop/shared/usr/libexec/bazzite-flatpak-manager index 6a0badef..58397ad7 100755 --- a/system_files/desktop/shared/usr/libexec/bazzite-flatpak-manager +++ b/system_files/desktop/shared/usr/libexec/bazzite-flatpak-manager @@ -1,7 +1,7 @@ #!/usr/bin/bash # SCRIPT VERSION -VER=19 +VER=20 VER_FILE="/etc/bazzite/flatpak_manager_version" VER_RAN=$(cat $VER_FILE) IMAGE_INFO="/usr/share/ublue-os/image-info.json" diff --git a/system_files/desktop/shared/usr/libexec/bazzite-hardware-setup b/system_files/desktop/shared/usr/libexec/bazzite-hardware-setup index 0eae273f..1c546eeb 100755 --- a/system_files/desktop/shared/usr/libexec/bazzite-hardware-setup +++ b/system_files/desktop/shared/usr/libexec/bazzite-hardware-setup @@ -7,7 +7,7 @@ IMAGE_FLAVOR=$(jq -r '."image-flavor"' < $IMAGE_INFO) FEDORA_VERSION=$(jq -r '."fedora-version"' < $IMAGE_INFO) # SCRIPT VERSION -HWS_VER=34 +HWS_VER=35 HWS_VER_FILE="/etc/bazzite/hws_version" HWS_VER_RAN=$(cat $HWS_VER_FILE) From ae9b33622c72997056ee3faa09adbb5db9988f30 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sat, 24 Feb 2024 21:55:21 -0800 Subject: [PATCH 02/24] chore: Update kf5-kio --- ...d-network-directories-in-file-picker.patch | 30 ------------------- spec_files/kf5-kio/kf5-kio.spec | 10 +++---- 2 files changed, 5 insertions(+), 35 deletions(-) delete mode 100644 spec_files/kf5-kio/expand-network-directories-in-file-picker.patch diff --git a/spec_files/kf5-kio/expand-network-directories-in-file-picker.patch b/spec_files/kf5-kio/expand-network-directories-in-file-picker.patch deleted file mode 100644 index 1feba4f6..00000000 --- a/spec_files/kf5-kio/expand-network-directories-in-file-picker.patch +++ /dev/null @@ -1,30 +0,0 @@ -From af3af80d30025711574d1ca450dc0aed9d44d7fd Mon Sep 17 00:00:00 2001 -From: Alessandro Astone -Date: Wed, 10 Jan 2024 22:18:58 +0100 -Subject: [PATCH] KDirModel: Allow expanding network directories in file picker - again - -Closes: https://invent.kde.org/frameworks/kio/-/issues/29 - -BUG: 479531 ---- - src/widgets/kdirmodel.cpp | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/widgets/kdirmodel.cpp b/src/widgets/kdirmodel.cpp -index c274256811..9dbd8e3e9e 100644 ---- a/src/widgets/kdirmodel.cpp -+++ b/src/widgets/kdirmodel.cpp -@@ -1329,8 +1329,7 @@ bool KDirModel::canFetchMore(const QModelIndex &parent) const - - KDirModelNode *node = static_cast(parent.internalPointer()); - const KFileItem &item = node->item(); -- return item.isDir() && !static_cast(node)->isOnNetwork() && !static_cast(node)->isPopulated() -- && static_cast(node)->m_childNodes.isEmpty(); -+ return item.isDir() && !static_cast(node)->isPopulated() && static_cast(node)->m_childNodes.isEmpty(); - } - - void KDirModel::fetchMore(const QModelIndex &parent) --- -GitLab - diff --git a/spec_files/kf5-kio/kf5-kio.spec b/spec_files/kf5-kio/kf5-kio.spec index 88e1f84e..8c8b94e9 100644 --- a/spec_files/kf5-kio/kf5-kio.spec +++ b/spec_files/kf5-kio/kf5-kio.spec @@ -3,7 +3,7 @@ %bcond kf6_compat %[0%{?fedora} >= 40 || 0%{?rhel} >= 10] Name: kf5-%{framework} -%global majmin 5.113 +%global majmin 5.115 Version: %{majmin}.0 Release: 2%{?dist}.bazzite.{{{ git_dir_version }}} Summary: KDE Frameworks 5 Tier 3 solution for filesystem abstraction @@ -14,11 +14,8 @@ URL: https://invent.kde.org/frameworks/%{framework} Source0: https://download.kde.org/stable/frameworks/%{majmin}/%{framework}-%{version}.tar.xz ## upstream patches (lookaside) -# https://invent.kde.org/frameworks/kio/-/merge_requests/1536 -Patch0: expand-network-directories-in-file-picker.patch - # https://invent.kde.org/frameworks/kio/-/merge_requests/1556 -Patch1: 1556.patch +Patch0: 1556.patch ## upstreamable patches @@ -299,6 +296,9 @@ rm %{buildroot}%{_datadir}/applications/kcm_trash.desktop %{_kf5_libdir}/cmake/KF5KIO/ %changelog +* Sat Feb 10 2024 Marc Deop i Argemí - 5.115.0-1 +- 5.115.0 + * Sun Jan 14 2024 Alessandro Astone - 5.113.0-2 - Backport patch to fix expanding network directories in file picker From d488419154721e0128443ed42eddca33749e7eda Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sat, 24 Feb 2024 21:56:46 -0800 Subject: [PATCH 03/24] chore: Use correct repo for bluez & pipewire --- Containerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Containerfile b/Containerfile index 83e95490..3dde6005 100644 --- a/Containerfile +++ b/Containerfile @@ -684,7 +684,7 @@ RUN rpm-ostree install \ # Install Steam Deck patched Pipewire, Wireplumber, Bluez & UPower RUN rpm-ostree override replace \ --experimental \ - --from repo=copr:copr.fedorainfracloud.org:kylegospo:bazzite \ + --from repo=copr:copr.fedorainfracloud.org:kylegospo:bazzite-multilib \ pipewire \ pipewire-alsa \ pipewire-gstreamer \ @@ -696,7 +696,10 @@ RUN rpm-ostree override replace \ bluez \ bluez-cups \ bluez-libs \ - bluez-obexd \ + bluez-obexd && \ + rpm-ostree override replace \ + --experimental \ + --from repo=copr:copr.fedorainfracloud.org:kylegospo:bazzite \ wireplumber \ wireplumber-libs \ upower \ From 0ca4b77a1eebbba2ea4ed0058a15e7f6192a3719 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sat, 24 Feb 2024 22:10:15 -0800 Subject: [PATCH 04/24] chore: Override nvidia egl-wayland package if present --- Containerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 3dde6005..f90c3228 100644 --- a/Containerfile +++ b/Containerfile @@ -810,7 +810,12 @@ RUN wget https://copr.fedorainfracloud.org/coprs/gloriouseggroll/nvidia-explicit rpm-ostree override replace \ --experimental \ --from repo=copr:copr.fedorainfracloud.org:gloriouseggroll:nvidia-explicit-sync \ - xorg-x11-server-Xwayland + xorg-x11-server-Xwayland && \ + rpm-ostree override replace \ + --experimental \ + --from repo=copr:copr.fedorainfracloud.org:gloriouseggroll:nvidia-explicit-sync \ + egl-wayland \ + || true # Cleanup & Finalize RUN rm -rf \ From 6422228e7e150e8685f3a0616074b15f3359cf9c Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sat, 24 Feb 2024 22:38:32 -0800 Subject: [PATCH 05/24] chore(readme): Add ISO status --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 961dec86..ecd39d3f 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Bazzite

-[![build-bazzite](https://github.com/ublue-os/bazzite/actions/workflows/build.yml/badge.svg)](https://github.com/ublue-os/bazzite/actions/workflows/build.yml) +[![build-bazzite](https://github.com/ublue-os/bazzite/actions/workflows/build.yml/badge.svg)](https://github.com/ublue-os/bazzite/actions/workflows/build.yml) [![build-bazzite-isos](https://github.com/ublue-os/bazzite/actions/workflows/build_iso.yml/badge.svg)](https://github.com/ublue-os/bazzite/actions/workflows/build_iso.yml) # [🇺🇸](https://github.com/ublue-os/bazzite/blob/main/README.md) [🇪🇸](https://github.com/ublue-os/bazzite/blob/main/README-SPA.md) [🇮🇩](https://github.com/ublue-os/bazzite/blob/main/README-ID.md) From 94c97eebf196e044bd2111e51afac9872a56cbf5 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sat, 24 Feb 2024 22:49:44 -0800 Subject: [PATCH 06/24] chore(ci): Pre-emptively add budgie to ISO builder --- .github/workflows/build_iso.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml index 5f56fcd6..27122714 100644 --- a/.github/workflows/build_iso.yml +++ b/.github/workflows/build_iso.yml @@ -30,11 +30,10 @@ jobs: - name: Set EXTRA_BOOT_ARGS run: | EXTRA_BOOT_ARGS="" - if [[ "${{ matrix.image_name }}" == "bazzite=deck" || "${{ matrix.image_name }}" == "bazzite-deck-gnome" ]]; then + if [[ "${{ matrix.image_name }}" == "bazzite=deck" || "${{ matrix.image_name }}" == "bazzite-deck-gnome" || "${{ matrix.image_name }}" == "bazzite-deck-budgie" ]]; then EXTRA_BOOT_ARGS="inst.resolution=1280x800" fi - name: Build ISOs - #if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch uses: ublue-os/isogenerator@1.0.6 with: ARCH: x86_64 From 44d6bc458bcd585617817faa1eb3bb582175817f Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sat, 24 Feb 2024 23:08:08 -0800 Subject: [PATCH 07/24] chore(gnome): Replace Pods with BoxBuddy in Container folder --- .../silverblue/usr/etc/dconf/db/local.d/04-bazzite-folders | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system_files/desktop/silverblue/usr/etc/dconf/db/local.d/04-bazzite-folders b/system_files/desktop/silverblue/usr/etc/dconf/db/local.d/04-bazzite-folders index ae40d679..28806a17 100644 --- a/system_files/desktop/silverblue/usr/etc/dconf/db/local.d/04-bazzite-folders +++ b/system_files/desktop/silverblue/usr/etc/dconf/db/local.d/04-bazzite-folders @@ -18,7 +18,7 @@ name='X-GNOME-Utilities.directory' translate=true [org/gnome/desktop/app-folders/folders/Containers] -apps=['com.github.marhkb.Pods.desktop'] +apps=['io.github.dvlv.boxbuddyrs'] categories=['Distrobox'] name='Containers' translate=false From 7c35c11ebe9624309ea1cedea6efa0d8b24db74f Mon Sep 17 00:00:00 2001 From: Pat Connors <121328689+nicknamenamenick@users.noreply.github.com> Date: Sun, 25 Feb 2024 02:47:35 -0500 Subject: [PATCH 08/24] chore(readme): Changes to reflect new ISOs chore(readme): Remove troubleshoot guide link chore(readme): Revert to releases page chore(readme): Remove Troubleshoot Guide Link fix(readme): Bold --- README-ID.md | 6 +++--- README-SPA.md | 6 +++--- README.md | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README-ID.md b/README-ID.md index 8772d478..19d4fe71 100644 --- a/README-ID.md +++ b/README-ID.md @@ -70,7 +70,7 @@ Varian umum yang tersedia sebagai `bazzite`, cocok untuk komputer desktop. - Pembaruan otomatis untuk Sistem Operasi,Flatpak,Nix package (dengan Fleek), dan semua kontainer Distrobox. > [!IMPORTANT] -> **ISO bisa diunduh dari halaman rilis kami [disini](https://github.com/ublue-os/bazzite/releases), dan berbagai macam panduan instalasi dapat ditemukan [disini](https://universal-blue.discourse.group/docs?topic=30).** Jika anda menemukan masalah ketika menginstall Bazzite, anda dapat mengunjungi [panduan memecahkan masalah](https://universal-blue.discourse.group/docs?topic=34). +> **ISO bisa diunduh dari halaman rilis kami [disini](https://github.com/ublue-os/bazzite/releases), dan berbagai macam panduan instalasi dapat ditemukan [disini](https://universal-blue.discourse.group/docs?topic=30).** Jika anda telah menggunakan image dari Universal Blue anda dapat mengikuti [instruksi ini](https://universal-blue.org/images/#image-list). Untuk berganti image dari image upstream Fedora Silverblue/Kinoite ostree anda dapat mengikuti perintah ini: @@ -125,7 +125,7 @@ Varian `bazzite-deck` ini didesain untuk digunakan sebagai alternatif untuk Stea > **Dikarenakan ada bug/kutu dari upstream,Bazzite tidak bisa digunakan pada perangkat SteamDeck yang memiliki penyimpanan 64GB eMMC. meningkatkan penyimpanan menyelesaikan masalah ini.** > [!IMPORTANT] -> **ISO bisa diunduh dari halaman rilis kami [disini](https://github.com/ublue-os/bazzite/releases), dan berbagai macam panduan instalasi dapat ditemukan [disini](https://universal-blue.discourse.group/docs?topic=30).** Jika anda menemukan masalah ketika menginstall Bazzite, anda dapat mengunjungi [panduan memecahkan masalah](https://universal-blue.discourse.group/docs?topic=34). +> **ISO bisa diunduh dari halaman rilis kami [disini](https://github.com/ublue-os/bazzite/releases), dan berbagai macam panduan instalasi dapat ditemukan [disini](https://universal-blue.discourse.group/docs?topic=30).** Jika anda telah menggunakan image dari Universal Blue anda dapat mengikuti [instruksi ini](https://universal-blue.org/images/#image-list). Untuk berganti image dari image upstream Fedora Silverblue/Kinoite ostree anda dapat mengikuti perintah ini: @@ -146,7 +146,7 @@ Varian desktop GNOME tersedia dalam versi desktop dan deck.varian ini memiliki b - Pembaruan otomatis untuk [Firefox GNOME theme](https://github.com/rafaelmardojai/firefox-gnome-theme) dan [Thunderbird GNOME theme](https://github.com/rafaelmardojai/thunderbird-gnome-theme). (jika terinstall) > [!IMPORTANT] -> **ISO bisa diunduh dari halaman rilis kami [disini](https://github.com/ublue-os/bazzite/releases), dan berbagai macam panduan instalasi dapat ditemukan [disini](https://universal-blue.discourse.group/docs?topic=30).** Jika anda menemukan masalah ketika menginstall Bazzite, anda dapat mengunjungi [panduan memecahkan masalah](https://universal-blue.discourse.group/docs?topic=34). +> **ISO bisa diunduh dari halaman rilis kami [disini](https://github.com/ublue-os/bazzite/releases), dan berbagai macam panduan instalasi dapat ditemukan [disini](https://universal-blue.discourse.group/docs?topic=30).** Untuk rebase dari sistem ostree yang ada ke varian **desktop**: diff --git a/README-SPA.md b/README-SPA.md index 2a6487e4..930e93d2 100644 --- a/README-SPA.md +++ b/README-SPA.md @@ -83,7 +83,7 @@ Esta variante común/genérica esta disponible como `bazzite`, la cual es adecua - Actualizaciones automáticas para el sistema operativo, Flatpaks, paquetes Nix (Usando Fleek), y todos los contenedores Distrobox. > \[!IMPORTANT\]\ -> **Las imágenes de disco (ISOs) pueden descargarse desde nuestra página de lanzamientos (releases) [aquí (en inglés)](https://github.com/ublue-os/bazzite/releases), también puedes encontrar una útil guía de instalación [aquí (en inglés)](https://universal-blue.discourse.group/docs?topic=30).** Si experimentas errores y/o problemas instalando Bazzite, checa nuestra [guía de solución de problemas (en inglés)](https://universal-blue.discourse.group/docs?topic=34). +> **Las imágenes de disco (ISOs) pueden descargarse desde nuestra página de lanzamientos (releases) [aquí (en inglés)](https://github.com/ublue-os/bazzite/releases), también puedes encontrar una útil guía de instalación [aquí (en inglés)](https://universal-blue.discourse.group/docs?topic=30).** Si estas actualmente usando una imagen de Universal Blue, por favor [sigue estas instrucciones (en inglés)](https://universal-blue.org/images/#image-list). @@ -142,7 +142,7 @@ Esta variante esta diseñada para usarse como una alternativa de SteamOS en la S > **Debido a un bug en upstream, Bazzite no puede ser utilizado por el momento en Steam Decks con solo 64 GB de almacenamiento eMMC. Ampliar tu almacenamiento cambiando el disco interno soluciona este problema.** > \[!IMPORTANT\]\ -> **Las imágenes de disco (ISOs) pueden descargarse desde nuestra página de lanzamientos (releases) [aquí (en inglés)](https://github.com/ublue-os/bazzite/releases), también puedes encontrar una útil guía de instalación [aquí (en inglés)](https://universal-blue.discourse.group/docs?topic=30).** Si experimentas errores y/o problemas instalando Bazzite, checa nuestra [guía de solución de problemas (en inglés)](https://universal-blue.discourse.group/docs?topic=34). +> **Las imágenes de disco (ISOs) pueden descargarse desde nuestra página de lanzamientos (releases) [aquí (en inglés)](https://github.com/ublue-os/bazzite/releases), también puedes encontrar una útil guía de instalación [aquí (en inglés)](https://universal-blue.discourse.group/docs?topic=30).** Si estas actualmente usando una imagen de Universal Blue, por favor [sigue estas instrucciones (en inglés)](https://universal-blue.org/images/#image-list). @@ -220,7 +220,7 @@ Las sub-variantes con el entorno de escritorio GNOME están disponibles tanto pa - Actualizaciones automáticas para el [tema de GNOME para Firefox](https://github.com/rafaelmardojai/firefox-gnome-theme) y el [tema de GNOME para Thunderbird](https://github.com/rafaelmardojai/thunderbird-gnome-theme). (Si se encuentran instalados) > \[!IMPORTANT\]\ -> \**Las imágenes de disco (ISOs) pueden descargarse desde nuestra página de lanzamientos (releases) [aquí (en inglés)](https://github.com/ublue-os/bazzite/releases), también puedes encontrar una útil guía de instalación [aquí (en inglés)](https://universal-blue.discourse.group/docs?topic=30).** Si experimentas errores y/o problemas instalando Bazzite, checa nuestra [guía de solución de problemas (en inglés)](https://universal-blue.discourse.group/docs?topic=34). +> \**Las imágenes de disco (ISOs) pueden descargarse desde nuestra página de lanzamientos (releases) [aquí (en inglés)](https://github.com/ublue-os/bazzite/releases), también puedes encontrar una útil guía de instalación [aquí (en inglés)](https://universal-blue.discourse.group/docs?topic=30).** Si deseas cambiar la base (rebase) a la imagen **para computadoras de escritorio con una GPU AMD ó Intel**, ejecuta el siguiente comando en una terminal: diff --git a/README.md b/README.md index ecd39d3f..c6634d95 100644 --- a/README.md +++ b/README.md @@ -80,9 +80,9 @@ Common variant available as `bazzite`, suitable for desktop computers. - Automatic updates for the OS, Flatpaks, and all Distrobox containers - powered by [ublue-update](https://github.com/ublue-os/ublue-update) and [topgrade](https://github.com/topgrade-rs/topgrade). > [!IMPORTANT] -> **ISOs can be downloaded from our releases page [here](https://github.com/ublue-os/bazzite/releases), and a helpful install guide can be found [here](https://universal-blue.discourse.group/docs?topic=30).** If you experience any issues with installing Bazzite, then check out our [troubleshoot guide](https://universal-blue.discourse.group/docs?topic=34). +> **ISOs can be downloaded from our [releases page](https://github.com/ublue-os/bazzite/releases), and a helpful install guide can be found [here](https://universal-blue.discourse.group/docs?topic=30).** -If you're on an existing Universal Blue image follow [these instructions](https://universal-blue.org/images/#image-list). To rebase an existing upstream Fedora Silverblue/Kinoite ostree system to this image: +Rebase from an existing upstream Fedora Atomic to this image: ```bash rpm-ostree rebase ostree-unverified-registry:ghcr.io/ublue-os/bazzite:stable @@ -136,9 +136,9 @@ Variant designed for usage as an alternative to SteamOS on the Steam Deck, and f > **Due to an upstream bug, Bazzite cannot be used on Steam Decks with 64GB eMMC storage at this time. Upgrading the storage resolves the issue.** > [!IMPORTANT] -> **ISOs can be downloaded from our releases page [here](https://github.com/ublue-os/bazzite/releases), and a helpful install guide can be found [here](https://universal-blue.discourse.group/docs?topic=30).** If you experience any issues with installing Bazzite, then check out our [troubleshoot guide](https://universal-blue.discourse.group/docs?topic=34). +> **ISOs can be downloaded from our [releases page](https://github.com/ublue-os/bazzite/releases), and a helpful install guide can be found [here](https://universal-blue.discourse.group/docs?topic=30).** -If you're on an existing Universal Blue image follow [these instructions](https://universal-blue.org/images/#image-list). To rebase an existing upstream Fedora Silverblue/Kinoite ostree system to this image: +Rebase from an existing upstream Fedora Atomic to this image: ```bash rpm-ostree rebase ostree-unverified-registry:ghcr.io/ublue-os/bazzite-deck:stable @@ -178,9 +178,9 @@ Builds with the GNOME desktop environment are available in both desktop and deck - Automatic updates for the [Firefox GNOME theme](https://github.com/rafaelmardojai/firefox-gnome-theme) and [Thunderbird GNOME theme](https://github.com/rafaelmardojai/thunderbird-gnome-theme). (If installed) > [!IMPORTANT] -> **ISOs can be downloaded from our releases page [here](https://github.com/ublue-os/bazzite/releases), and a helpful install guide can be found [here](https://universal-blue.discourse.group/docs?topic=30).** If you experience any issues with installing Bazzite, then check out our [troubleshoot guide](https://universal-blue.discourse.group/docs?topic=34). +> **ISOs can be downloaded from our [releases page](https://github.com/ublue-os/bazzite/releases), and a helpful install guide can be found [here](https://universal-blue.discourse.group/docs?topic=30).** -To rebase an existing ostree system to the **desktop** release: +Rebase from an existing upstream Fedora Atomic to this image: ```bash rpm-ostree rebase ostree-unverified-registry:ghcr.io/ublue-os/bazzite-gnome:stable From 64edcd76606d858edde46b0a5c622b8ba6a78c02 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sun, 25 Feb 2024 00:20:36 -0800 Subject: [PATCH 09/24] chore(ci): Rename ISO step --- .github/workflows/build_iso.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml index 27122714..44a2a797 100644 --- a/.github/workflows/build_iso.yml +++ b/.github/workflows/build_iso.yml @@ -1,4 +1,4 @@ -name: Build Bazzite ISOs +name: Build ISOs on: workflow_dispatch: env: From 00faf9226a3248571a34a2b23080f4587c3b2544 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sun, 25 Feb 2024 00:49:25 -0800 Subject: [PATCH 10/24] chore(ci): Fix variable name --- .github/workflows/build_iso.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml index 44a2a797..3912a59a 100644 --- a/.github/workflows/build_iso.yml +++ b/.github/workflows/build_iso.yml @@ -27,11 +27,11 @@ jobs: major_version: [39] image_tag: [stable] steps: - - name: Set EXTRA_BOOT_ARGS + - name: Set EXTRA_BOOT_PARAMS run: | - EXTRA_BOOT_ARGS="" + EXTRA_BOOT_PARAMS="" if [[ "${{ matrix.image_name }}" == "bazzite=deck" || "${{ matrix.image_name }}" == "bazzite-deck-gnome" || "${{ matrix.image_name }}" == "bazzite-deck-budgie" ]]; then - EXTRA_BOOT_ARGS="inst.resolution=1280x800" + EXTRA_BOOT_PARAMS="inst.resolution=1280x800" fi - name: Build ISOs uses: ublue-os/isogenerator@1.0.6 @@ -44,7 +44,7 @@ jobs: IMAGE_TAG: ${{ matrix.image_tag }} ACTION_REPO: ublue-os/isogenerator ACTION_REF: 1.0.6 - EXTRA_BOOT_ARGS: ${{ env.EXTRA_BOOT_ARGS }} + EXTRA_BOOT_PARAMS: ${{ env.EXTRA_BOOT_PARAMS }} - name: Upload ISOs and SHA Checksum Files to R2 shell: bash run: | From 2843cbc6493d414767746685c9e72403001315bb Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sun, 25 Feb 2024 00:51:40 -0800 Subject: [PATCH 11/24] chore(ci): Fix image name check --- .github/workflows/build_iso.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml index 3912a59a..b08e0fab 100644 --- a/.github/workflows/build_iso.yml +++ b/.github/workflows/build_iso.yml @@ -30,7 +30,7 @@ jobs: - name: Set EXTRA_BOOT_PARAMS run: | EXTRA_BOOT_PARAMS="" - if [[ "${{ matrix.image_name }}" == "bazzite=deck" || "${{ matrix.image_name }}" == "bazzite-deck-gnome" || "${{ matrix.image_name }}" == "bazzite-deck-budgie" ]]; then + if [[ "${{ matrix.image_name }}" == "bazzite-deck" || "${{ matrix.image_name }}" == "bazzite-deck-gnome" || "${{ matrix.image_name }}" == "bazzite-deck-budgie" ]]; then EXTRA_BOOT_PARAMS="inst.resolution=1280x800" fi - name: Build ISOs From a69e3e474a55b8c1dcdb3aed27590297de3d4550 Mon Sep 17 00:00:00 2001 From: Noel Miller <4983138+noelmiller@users.noreply.github.com> Date: Sun, 25 Feb 2024 12:27:51 -0600 Subject: [PATCH 12/24] chore(ci): update version with fix (#810) --- .github/workflows/build_iso.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml index b08e0fab..8ca8aae2 100644 --- a/.github/workflows/build_iso.yml +++ b/.github/workflows/build_iso.yml @@ -34,7 +34,7 @@ jobs: EXTRA_BOOT_PARAMS="inst.resolution=1280x800" fi - name: Build ISOs - uses: ublue-os/isogenerator@1.0.6 + uses: ublue-os/isogenerator@1.0.7 with: ARCH: x86_64 IMAGE_NAME: ${{ matrix.image_name }} @@ -43,7 +43,7 @@ jobs: VERSION: ${{ matrix.major_version }} IMAGE_TAG: ${{ matrix.image_tag }} ACTION_REPO: ublue-os/isogenerator - ACTION_REF: 1.0.6 + ACTION_REF: 1.0.7 EXTRA_BOOT_PARAMS: ${{ env.EXTRA_BOOT_PARAMS }} - name: Upload ISOs and SHA Checksum Files to R2 shell: bash From 37828c4cd883036258af079b294580a232a2852a Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Sun, 25 Feb 2024 19:39:00 -0600 Subject: [PATCH 13/24] chore(ci): add EXTRA_BOOT_ARGS to env for ISO build (#813) --- .github/workflows/build_iso.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml index 8ca8aae2..ce5abe9d 100644 --- a/.github/workflows/build_iso.yml +++ b/.github/workflows/build_iso.yml @@ -33,6 +33,7 @@ jobs: if [[ "${{ matrix.image_name }}" == "bazzite-deck" || "${{ matrix.image_name }}" == "bazzite-deck-gnome" || "${{ matrix.image_name }}" == "bazzite-deck-budgie" ]]; then EXTRA_BOOT_PARAMS="inst.resolution=1280x800" fi + echo "EXTRA_BOOT_PARAMS=$EXTRA_BOOT_PARAMS" >> $GITHUB_ENV - name: Build ISOs uses: ublue-os/isogenerator@1.0.7 with: From b59d7bc43b17dcbc2c1adcb7fb615cc8d4ece85f Mon Sep 17 00:00:00 2001 From: Pat Connors <121328689+nicknamenamenick@users.noreply.github.com> Date: Mon, 26 Feb 2024 11:11:27 -0500 Subject: [PATCH 14/24] chore(readme): Link CSS Loader Installer Guide (#817) * chore(readme): Link CSS Loader Installer Guide * chore(readme-SPA): Link CSS Loader Installer Guide --- README-SPA.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README-SPA.md b/README-SPA.md index 930e93d2..cf8a0429 100644 --- a/README-SPA.md +++ b/README-SPA.md @@ -163,7 +163,7 @@ Si estas usando una computadora Handheld que tiene soporte por parte de [hhd](ht **Igualmente, asegurate de tambien leer la [documentación de HHD (en inglés)](https://github.com/hhd-dev/hhd#after-install), algunas computadoras Handheld requieren ciertos ajustes o tweaks especificos para funcionar correctamente.** -Tambien incluimos ciertos comandos de `ujust` para instalar varios temas para CSS Loader que no estan disponibles en su propia tienda. Si instalas estos temas, estos tambien serán actualizados automáticamente junto con Bazzite. +Tambien incluimos ciertos comandos de `ujust` para instalar varios temas para [CSS Loader](https://docs.deckthemes.com/CSSLoader/Install/#linux-or-steam-deck) que no estan disponibles en su propia tienda. Si instalas estos temas, estos tambien serán actualizados automáticamente junto con Bazzite. ```bash # Instala el tema de la ROG Ally para CSS Loader (https://github.com/semakusut/SBP-ROG-Ally) diff --git a/README.md b/README.md index c6634d95..d6500949 100644 --- a/README.md +++ b/README.md @@ -154,7 +154,7 @@ If you're using a handheld supported by [hhd](https://github.com/hhd-dev/hhd) Date: Tue, 27 Feb 2024 19:44:10 +1100 Subject: [PATCH 15/24] fix: correct orientation for GPD Win Max 2 (2022) (#819) --- .../desktop/shared/usr/libexec/hardware/rotation-fix-hardware | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system_files/desktop/shared/usr/libexec/hardware/rotation-fix-hardware b/system_files/desktop/shared/usr/libexec/hardware/rotation-fix-hardware index 16f09f52..67b059fa 100755 --- a/system_files/desktop/shared/usr/libexec/hardware/rotation-fix-hardware +++ b/system_files/desktop/shared/usr/libexec/hardware/rotation-fix-hardware @@ -1,7 +1,7 @@ #!/usr/bin/bash # Returns true for hardware that needs a rotation fix in KDE SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)" -if [[ ":ROG Ally RC71L_RC71L:ROG Ally RC71L:83E1:Loki Max:G1618-04:21A0007TUK:" =~ ":$SYS_ID:" ]]; then +if [[ ":ROG Ally RC71L_RC71L:ROG Ally RC71L:83E1:Loki Max:G1618-04:G1619-04:21A0007TUK:" =~ ":$SYS_ID:" ]]; then exit 0 else exit 1 From e980853e3cce651e3476f5046784163ebd3d546e Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Tue, 27 Feb 2024 15:00:09 -0800 Subject: [PATCH 16/24] fix(deck): Replace die with finish 0, may correct update errors some users have been experiencing --- spec_files/jupiter-hw-support/biosupdate.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec_files/jupiter-hw-support/biosupdate.patch b/spec_files/jupiter-hw-support/biosupdate.patch index 529c9f40..31142eac 100644 --- a/spec_files/jupiter-hw-support/biosupdate.patch +++ b/spec_files/jupiter-hw-support/biosupdate.patch @@ -5,7 +5,7 @@ [[ ! -f $BIOS_INHIBIT_FILE ]] || die "Bios updates inhibited, no action ($BIOS_INHIBIT_FILE)" +if ! systemctl is-enabled jupiter-biosupdate.service; then -+ die "Bios updates inhibited, no action (Service disabled)" ++ finish 0 no "Bios updates inhibited, no action (Service disabled)" +fi + # Print action From 93bc12f3044b0e559f7edc3188d375521f238db8 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Tue, 27 Feb 2024 18:29:45 -0800 Subject: [PATCH 17/24] fix: Correct issue with user setup script execution check --- system_files/desktop/shared/usr/libexec/bazzite-user-setup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system_files/desktop/shared/usr/libexec/bazzite-user-setup b/system_files/desktop/shared/usr/libexec/bazzite-user-setup index 783645e0..c002c322 100755 --- a/system_files/desktop/shared/usr/libexec/bazzite-user-setup +++ b/system_files/desktop/shared/usr/libexec/bazzite-user-setup @@ -28,8 +28,8 @@ USER_SETUP_FEDORA_VER_RAN=$(cat $USER_SETUP_FEDORA_VER_FILE) USER_SETUP_IMAGE_VER_RAN=$(cat $USER_SETUP_IMAGE_VER_FILE) # Run script if updated -if [[ -f $USER_SETUP_VER_FILE && $USER_SETUP_VER = $USER_SETUP_VER_RAN ]]; then - if [[ -f $USER_SETUP_FEDORA_VER_FILE && $FEDORA_VERSION = $USER_SETUP_FEDORA_VER_RAN && $BASE_IMAGE_NAME == USER_SETUP_IMAGE_VER_RAN ]]; then +if [[ -f $USER_SETUP_VER_FILE && -f $USER_SETUP_FEDORA_VER_RAN && -f $USER_SETUP_FEDORA_VER_FILE ]]; then + if [[ $USER_SETUP_VER = "$USER_SETUP_VER_RAN" && $FEDORA_VERSION = "$USER_SETUP_FEDORA_VER_RAN" && $BASE_IMAGE_NAME = "$USER_SETUP_IMAGE_VER_RAN" ]]; then echo "User setup v$USER_SETUP_VER has already run. Exiting..." exit 0 fi From 0fd73bfd9f98e72de13499e2fd8d3fc31aa98f84 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Tue, 27 Feb 2024 23:08:24 -0800 Subject: [PATCH 18/24] chore: Cleanup System76-Scheduler config --- system_files/deck/shared/usr/etc/system76-scheduler/config.kdl | 3 --- .../desktop/shared/usr/etc/system76-scheduler/config.kdl | 3 --- 2 files changed, 6 deletions(-) diff --git a/system_files/deck/shared/usr/etc/system76-scheduler/config.kdl b/system_files/deck/shared/usr/etc/system76-scheduler/config.kdl index 967be381..4e37f892 100644 --- a/system_files/deck/shared/usr/etc/system76-scheduler/config.kdl +++ b/system_files/deck/shared/usr/etc/system76-scheduler/config.kdl @@ -39,9 +39,6 @@ process-scheduler enable=true { // Video games games nice=-5 io=(best-effort)0 - // Video game background tasks - games-background nice=0 io="idle" - // Desktop environments desktop-environment nice=-3 io=(best-effort)0 diff --git a/system_files/desktop/shared/usr/etc/system76-scheduler/config.kdl b/system_files/desktop/shared/usr/etc/system76-scheduler/config.kdl index f7d6e47a..c98a3b0a 100644 --- a/system_files/desktop/shared/usr/etc/system76-scheduler/config.kdl +++ b/system_files/desktop/shared/usr/etc/system76-scheduler/config.kdl @@ -39,9 +39,6 @@ process-scheduler enable=true { // Video games games nice=-5 io=(best-effort)0 - // Video game background tasks - games-background nice=0 io="idle" - // Desktop environments desktop-environment nice=-3 io=(best-effort)0 From 9ad38388dfa8c76deb17395c927de6b8d85f67f2 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Tue, 27 Feb 2024 23:25:37 -0800 Subject: [PATCH 19/24] chore: Ignore sunshine in system76-scheduler config, Nice value for this should instead be set by systemd --- system_files/deck/shared/usr/etc/system76-scheduler/config.kdl | 1 + .../desktop/shared/usr/etc/system76-scheduler/config.kdl | 1 + 2 files changed, 2 insertions(+) diff --git a/system_files/deck/shared/usr/etc/system76-scheduler/config.kdl b/system_files/deck/shared/usr/etc/system76-scheduler/config.kdl index 4e37f892..5a347878 100644 --- a/system_files/deck/shared/usr/etc/system76-scheduler/config.kdl +++ b/system_files/deck/shared/usr/etc/system76-scheduler/config.kdl @@ -99,6 +99,7 @@ process-scheduler enable=true { taskset vpower schedtool + sunshine tuned tuned-ppd } diff --git a/system_files/desktop/shared/usr/etc/system76-scheduler/config.kdl b/system_files/desktop/shared/usr/etc/system76-scheduler/config.kdl index c98a3b0a..d79b5978 100644 --- a/system_files/desktop/shared/usr/etc/system76-scheduler/config.kdl +++ b/system_files/desktop/shared/usr/etc/system76-scheduler/config.kdl @@ -91,6 +91,7 @@ process-scheduler enable=true { systemd taskset schedtool + sunshine tuned tuned-ppd } From fe48ae09067b44493e643a7ff905c07c4cab7098 Mon Sep 17 00:00:00 2001 From: Noel Miller <4983138+noelmiller@users.noreply.github.com> Date: Wed, 28 Feb 2024 14:35:40 -0600 Subject: [PATCH 20/24] feat: Update isogenerator to latest version (#822) This includes fixes for SECURE_BOOT_KEY_URL and allowing all languages to be available in the installer. --- .github/workflows/build_iso.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml index ce5abe9d..8256d829 100644 --- a/.github/workflows/build_iso.yml +++ b/.github/workflows/build_iso.yml @@ -35,7 +35,7 @@ jobs: fi echo "EXTRA_BOOT_PARAMS=$EXTRA_BOOT_PARAMS" >> $GITHUB_ENV - name: Build ISOs - uses: ublue-os/isogenerator@1.0.7 + uses: ublue-os/isogenerator@1.0.8 with: ARCH: x86_64 IMAGE_NAME: ${{ matrix.image_name }} @@ -43,8 +43,9 @@ jobs: VARIANT: 'Kinoite' VERSION: ${{ matrix.major_version }} IMAGE_TAG: ${{ matrix.image_tag }} + SECURE_BOOT_KEY_URL: 'https://github.com/ublue-os/akmods/raw/main/certs/public_key.der' ACTION_REPO: ublue-os/isogenerator - ACTION_REF: 1.0.7 + ACTION_REF: 1.0.8 EXTRA_BOOT_PARAMS: ${{ env.EXTRA_BOOT_PARAMS }} - name: Upload ISOs and SHA Checksum Files to R2 shell: bash From 1e26697007dfd22903d627bec1a3006c4ff26400 Mon Sep 17 00:00:00 2001 From: Noel Miller <4983138+noelmiller@users.noreply.github.com> Date: Wed, 28 Feb 2024 16:32:10 -0600 Subject: [PATCH 21/24] fix(ci): issues with enrollment password (#823) --- .github/workflows/build_iso.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml index 8256d829..c8e7566d 100644 --- a/.github/workflows/build_iso.yml +++ b/.github/workflows/build_iso.yml @@ -44,6 +44,7 @@ jobs: VERSION: ${{ matrix.major_version }} IMAGE_TAG: ${{ matrix.image_tag }} SECURE_BOOT_KEY_URL: 'https://github.com/ublue-os/akmods/raw/main/certs/public_key.der' + ENROLLMENT_PASSWORD: 'ublue-os' ACTION_REPO: ublue-os/isogenerator ACTION_REF: 1.0.8 EXTRA_BOOT_PARAMS: ${{ env.EXTRA_BOOT_PARAMS }} From b33fa296a84d1943dfb3e1866517224c564f6883 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Wed, 28 Feb 2024 21:54:39 -0800 Subject: [PATCH 22/24] chore: Remove package causing build issues --- Containerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Containerfile b/Containerfile index f90c3228..e150bea0 100644 --- a/Containerfile +++ b/Containerfile @@ -282,7 +282,6 @@ RUN rpm-ostree install \ glow \ gum \ setools \ - redhat-lsb-core \ cockpit-networkmanager \ cockpit-podman \ cockpit-selinux \ From cffb1acdc3086bd4ef5fb62e7cd161289e4a8921 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Thu, 29 Feb 2024 11:15:47 -0800 Subject: [PATCH 23/24] chore: Include filelight on KDE --- .../desktop/kinoite/usr/share/ublue-os/bazzite/flatpak/install | 1 + system_files/desktop/shared/usr/libexec/bazzite-flatpak-manager | 2 +- .../silverblue/usr/share/ublue-os/bazzite/flatpak/install | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/system_files/desktop/kinoite/usr/share/ublue-os/bazzite/flatpak/install b/system_files/desktop/kinoite/usr/share/ublue-os/bazzite/flatpak/install index 82fea334..90d06c0b 100644 --- a/system_files/desktop/kinoite/usr/share/ublue-os/bazzite/flatpak/install +++ b/system_files/desktop/kinoite/usr/share/ublue-os/bazzite/flatpak/install @@ -3,6 +3,7 @@ org.kde.gwenview org.kde.okular org.kde.kcalc org.kde.haruna +org.kde.filelight io.github.fastrizwaan.WineZGUI io.github.dvlv.boxbuddyrs it.mijorus.gearlever diff --git a/system_files/desktop/shared/usr/libexec/bazzite-flatpak-manager b/system_files/desktop/shared/usr/libexec/bazzite-flatpak-manager index 58397ad7..8d31c963 100755 --- a/system_files/desktop/shared/usr/libexec/bazzite-flatpak-manager +++ b/system_files/desktop/shared/usr/libexec/bazzite-flatpak-manager @@ -1,7 +1,7 @@ #!/usr/bin/bash # SCRIPT VERSION -VER=20 +VER=21 VER_FILE="/etc/bazzite/flatpak_manager_version" VER_RAN=$(cat $VER_FILE) IMAGE_INFO="/usr/share/ublue-os/image-info.json" diff --git a/system_files/desktop/silverblue/usr/share/ublue-os/bazzite/flatpak/install b/system_files/desktop/silverblue/usr/share/ublue-os/bazzite/flatpak/install index 848c1f9e..64236a81 100644 --- a/system_files/desktop/silverblue/usr/share/ublue-os/bazzite/flatpak/install +++ b/system_files/desktop/silverblue/usr/share/ublue-os/bazzite/flatpak/install @@ -7,6 +7,7 @@ com.github.tchx84.Flatseal io.github.flattool.Warehouse io.missioncenter.MissionCenter com.vysp3r.ProtonPlus +io.github.celluloid_player.Celluloid org.gnome.Calculator org.gnome.Calendar org.gnome.Characters @@ -20,7 +21,6 @@ org.gnome.NautilusPreviewer org.gnome.TextEditor org.gnome.Weather org.gnome.baobab -io.github.celluloid_player.Celluloid org.gnome.clocks org.gnome.font-viewer org.freedesktop.Platform.VulkanLayer.MangoHud//23.08 From 4b6565baa952f87f5939ded6b5fab5b133151e7a Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Thu, 29 Feb 2024 23:35:47 +0000 Subject: [PATCH 24/24] Upgrade isogenerator action and add pull_request trigger (#829) --- .github/workflows/build.yml | 2 ++ .github/workflows/build_iso.yml | 46 ++++++++++++++++++++++++--------- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 162ea473..47d02311 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,6 +13,7 @@ on: - 'spec_files/**' - 'post_install_files/**' - 'press_kit/**' + - '.github/workflows/build_iso.yml' push: branches: - testing @@ -24,6 +25,7 @@ on: - 'spec_files/**' - 'post_install_files/**' - 'press_kit/**' + - '.github/workflows/build_iso.yml' merge_group: workflow_dispatch: env: diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml index c8e7566d..5ebdcc63 100644 --- a/.github/workflows/build_iso.yml +++ b/.github/workflows/build_iso.yml @@ -1,6 +1,13 @@ name: Build ISOs + on: workflow_dispatch: + pull_request: + branches: + - main + paths: + - '.github/workflows/build_iso.yml' + env: IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} @@ -34,28 +41,43 @@ jobs: EXTRA_BOOT_PARAMS="inst.resolution=1280x800" fi echo "EXTRA_BOOT_PARAMS=$EXTRA_BOOT_PARAMS" >> $GITHUB_ENV + - name: Build ISOs - uses: ublue-os/isogenerator@1.0.8 + uses: ublue-os/isogenerator@1.0.9 + id: build with: ARCH: x86_64 IMAGE_NAME: ${{ matrix.image_name }} - IMAGE_REPO: ghcr.io/ublue-os + IMAGE_REPO: ${{ env.IMAGE_REGISTRY }} VARIANT: 'Kinoite' VERSION: ${{ matrix.major_version }} IMAGE_TAG: ${{ matrix.image_tag }} SECURE_BOOT_KEY_URL: 'https://github.com/ublue-os/akmods/raw/main/certs/public_key.der' ENROLLMENT_PASSWORD: 'ublue-os' - ACTION_REPO: ublue-os/isogenerator - ACTION_REF: 1.0.8 EXTRA_BOOT_PARAMS: ${{ env.EXTRA_BOOT_PARAMS }} - - name: Upload ISOs and SHA Checksum Files to R2 + + - name: Upload ISOs and Checksum to Job Artifacts + if: github.event_name == 'pull_request' + uses: actions/upload-artifact@v4 + with: + name: ${{ matrix.image_name }}-${{ matrix.image_tag }}-${{ matrix.major_version}} + path: ${{ steps.build.outputs.output-directory }} + if-no-files-found: error + retention-days: 0 + compression-level: 0 + overwrite: true + + - name: Upload ISOs and Checksum to R2 + if: github.event_name == 'workflow_dispatch' shell: bash + env: + RCLONE_CONFIG_R2_TYPE: s3 + RCLONE_CONFIG_R2_PROVIDER: Cloudflare + RCLONE_CONFIG_R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }} + RCLONE_CONFIG_R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }} + RCLONE_CONFIG_R2_REGION: auto + RCLONE_CONFIG_R2_ENDPOINT: ${{ secrets.R2_ENDPOINT }} + SOURCE_DIR: ${{ steps.build.outputs.output-directory }} run: | - export RCLONE_CONFIG_R2_TYPE=s3 - export RCLONE_CONFIG_R2_PROVIDER=Cloudflare - export RCLONE_CONFIG_R2_ACCESS_KEY_ID=${{ secrets.R2_ACCESS_KEY_ID }} - export RCLONE_CONFIG_R2_SECRET_ACCESS_KEY=${{ secrets.R2_SECRET_ACCESS_KEY }} - export RCLONE_CONFIG_R2_REGION=auto - export RCLONE_CONFIG_R2_ENDPOINT=${{ secrets.R2_ENDPOINT }} dnf install -y rclone - rclone copy ./end_iso R2:bazzite + rclone copy $SOURCE_DIR R2:bazzite