From 26a5e6bac8643de0bb24dc67ae7022e2bc2753f9 Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Sun, 13 Aug 2023 10:24:32 +0100 Subject: [PATCH 1/9] feature: enable fedora 39 builds --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 31e6dd2..f6da64f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: fail-fast: false matrix: image_name: [silverblue, kinoite, vauxite, sericea, base, lxqt, mate] - major_version: [37, 38] + major_version: [37, 38, 39] include: - major_version: 37 is_latest_version: false From 5afcab6f72623f581d903b46bc2b9d02d2fc2dde Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Tue, 19 Sep 2023 13:30:11 +0100 Subject: [PATCH 2/9] Update various files - disable vauxite F39, try to exclude raw-thumbnailer etc --- .github/workflows/build.yml | 2 ++ Containerfile | 6 +++--- main-install.sh | 16 ++++++++++------ main-packages.json | 10 ++++++++++ 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d63ed5d..fcc2bb7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,6 +43,8 @@ jobs: nvidia_version: 535 - image_flavor: nvidia nvidia_version: 0 + - image_flavor: vauxite + major_version: 39 steps: # Checkout push-to-registry action GitHub repository - name: Checkout Push to Registry action diff --git a/Containerfile b/Containerfile index fce7d56..759f392 100644 --- a/Containerfile +++ b/Containerfile @@ -1,12 +1,12 @@ ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}" ARG SOURCE_IMAGE="${SOURCE_IMAGE:-silverblue}" ARG BASE_IMAGE="quay.io/fedora-ostree-desktops/${SOURCE_IMAGE}" -ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}" +ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}" FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS main ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}" -ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}" +ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}" COPY github-release-install.sh /tmp/github-release-install.sh COPY main-install.sh /tmp/main-install.sh @@ -29,7 +29,7 @@ RUN mkdir -p /var/tmp && chmod -R 1777 /var/tmp FROM main AS nvidia ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}" -ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}" +ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}" ARG NVIDIA_MAJOR_VERSION="${NVIDIA_MAJOR_VERSION:-535}" COPY nvidia-install.sh /tmp/nvidia-install.sh diff --git a/main-install.sh b/main-install.sh index 7706f5a..d86e26b 100755 --- a/main-install.sh +++ b/main-install.sh @@ -30,12 +30,16 @@ for REPO in $(rpm -ql ublue-os-akmods-addons|grep ^"/etc"|grep repo$); do sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' ${REPO} done -rpm-ostree install \ - /tmp/akmods-rpms/kmods/*openrazer*.rpm \ - /tmp/akmods-rpms/kmods/*v4l2loopback*.rpm \ - /tmp/akmods-rpms/kmods/*xpadneo*.rpm \ - /tmp/akmods-rpms/kmods/*xone*.rpm \ - /tmp/akmods-rpms/kmods/*xpad-noone*.rpm +# Only run if FEDORA_MAJOR_VERSION is not 39 +if grep -qv "39" <<< $FEDORA_MAJOR_VERSION; then + echo "HELOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO" + rpm-ostree install \ + /tmp/akmods-rpms/kmods/*xpadneo*.rpm \ + /tmp/akmods-rpms/kmods/*xpad-noone*.rpm \ + /tmp/akmods-rpms/kmods/*xone*.rpm \ + /tmp/akmods-rpms/kmods/*openrazer*.rpm \ + /tmp/akmods-rpms/kmods/*v4l2loopback*.rpm +fi for REPO in $(rpm -ql ublue-os-akmods-addons|grep ^"/etc"|grep repo$); do echo "akmods: disable per defaults: ${REPO}" diff --git a/main-packages.json b/main-packages.json index f73a51e..19754c8 100644 --- a/main-packages.json +++ b/main-packages.json @@ -249,5 +249,15 @@ "exclude": { "all": [] } + }, + "39": { + "include": { + "all": [] + }, + "exclude": { + "all": [ + "raw-thumbnailer" + ] + } } } From 8e766a371928d1532d01d40e329b544fcddae272 Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Tue, 19 Sep 2023 13:31:16 +0100 Subject: [PATCH 3/9] Remove breakpoint --- main-install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/main-install.sh b/main-install.sh index d86e26b..b072782 100755 --- a/main-install.sh +++ b/main-install.sh @@ -32,7 +32,6 @@ done # Only run if FEDORA_MAJOR_VERSION is not 39 if grep -qv "39" <<< $FEDORA_MAJOR_VERSION; then - echo "HELOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO" rpm-ostree install \ /tmp/akmods-rpms/kmods/*xpadneo*.rpm \ /tmp/akmods-rpms/kmods/*xpad-noone*.rpm \ From 18b6987b766324a4e10cc1528991974f5792db81 Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Tue, 19 Sep 2023 06:53:57 -0600 Subject: [PATCH 4/9] fix: Attempt to correct f39 raw-thumbnailer exclusion --- main-packages.json | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/main-packages.json b/main-packages.json index 19754c8..7bef641 100644 --- a/main-packages.json +++ b/main-packages.json @@ -45,8 +45,7 @@ ], "silverblue": [ "adw-gtk3-theme", - "gnome-tweaks", - "raw-thumbnailer" + "gnome-tweaks" ], "kinoite": [ "icoutils", @@ -175,7 +174,6 @@ "pipewire-alsa", "pipewire-pulseaudio", "pluma", - "raw-thumbnailer", "seahorse", "seahorse-caja", "setroubleshoot", @@ -193,7 +191,6 @@ "clipman" ], "vauxite": [ - "raw-thumbnailer", "xfce4-clipman-plugin", "xfce4-whiskermenu-plugin" ] @@ -225,11 +222,18 @@ "37": { "include": { "all": [], + "silverblue": [ + "raw-thumbnailer" + ], "mate": [ "f37-backgrounds-base", "f37-backgrounds-extras-base", "f37-backgrounds-extras-mate", - "f37-backgrounds-mate" + "f37-backgrounds-mate", + "raw-thumbnailer" + ], + "vauxite": [ + "raw-thumbnailer" ] }, "exclude": { @@ -239,11 +243,18 @@ "38": { "include": { "all": [], + "silverblue": [ + "raw-thumbnailer" + ], "mate": [ "f38-backgrounds-base", "f38-backgrounds-extras-base", "f38-backgrounds-extras-mate", - "f38-backgrounds-mate" + "f38-backgrounds-mate", + "raw-thumbnailer" + ], + "vauxite": [ + "raw-thumbnailer" ] }, "exclude": { @@ -255,9 +266,7 @@ "all": [] }, "exclude": { - "all": [ - "raw-thumbnailer" - ] + "all": [] } } } From 7629da728cffa6f3059dc6a6e7eab6f11ef8ae98 Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Tue, 19 Sep 2023 07:27:52 -0600 Subject: [PATCH 5/9] feat: Introduce gts tag to track Fedora release - 1 This will allow users to stay one release behind the current Fedora release --- .github/workflows/build.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fcc2bb7..08e4a09 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,9 +27,15 @@ jobs: - major_version: 37 is_latest_version: false is_stable_version: true + is_gts_version: false - major_version: 38 is_latest_version: true is_stable_version: true + is_gts_version: true + - major_version: 39 + is_latest_version: true + is_stable_version: false + is_gts_version: false - nvidia_version: 535 is_latest_nvidia: true exclude: @@ -45,7 +51,7 @@ jobs: nvidia_version: 0 - image_flavor: vauxite major_version: 39 - steps: + steps: # Checkout push-to-registry action GitHub repository - name: Checkout Push to Registry action uses: actions/checkout@v4 @@ -105,6 +111,12 @@ jobs: BUILD_TAGS+=("${TIMESTAMP}") BUILD_TAGS+=("latest") fi + elif [[ "${{ matrix.is_gts_version }}" == "true" ]]; then + if [[ "${{ matrix.image_flavor }}" == "main" ]] || \ + [[ "${{ matrix.is_latest_nvidia }}" == "true" ]]; then + BUILD_TAGS+=("gts-${TIMESTAMP}") + BUILD_TAGS+=("gts") + fi fi if [[ "${{ github.event_name }}" == "pull_request" ]]; then From 850353885d1095b8e4dd64e4a0990856e7e62c4d Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Tue, 19 Sep 2023 07:34:46 -0600 Subject: [PATCH 6/9] fix: Remove default-fonts-cjk-sans from f39 --- main-packages.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/main-packages.json b/main-packages.json index 7bef641..13b548e 100644 --- a/main-packages.json +++ b/main-packages.json @@ -266,7 +266,9 @@ "all": [] }, "exclude": { - "all": [] + "all": [ + "default-fonts-cjk-sans" + ] } } } From 2a042b4b15ecf71a66592a6e88304ed8d26a9d8e Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Tue, 19 Sep 2023 07:08:01 -0600 Subject: [PATCH 7/9] fix: Exclude google-noto-sans-cjk-fonts from f39 --- main-packages.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/main-packages.json b/main-packages.json index 13b548e..6c15e60 100644 --- a/main-packages.json +++ b/main-packages.json @@ -27,7 +27,6 @@ "google-noto-sans-javanese-fonts", "google-noto-sans-balinese-fonts", "google-noto-sans-sundanese-fonts", - "google-noto-sans-cjk-fonts", "nvme-cli", "nvtop", "openrgb-udev-rules", @@ -221,7 +220,9 @@ }, "37": { "include": { - "all": [], + "all": [ + "google-noto-sans-cjk-fonts" + ], "silverblue": [ "raw-thumbnailer" ], @@ -242,7 +243,9 @@ }, "38": { "include": { - "all": [], + "all": [ + "google-noto-sans-cjk-fonts" + ], "silverblue": [ "raw-thumbnailer" ], From de3773e67ff6436cb282f31c13998f452d78120c Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Tue, 19 Sep 2023 08:17:11 -0600 Subject: [PATCH 8/9] fix(nvidia): Don't try to disable modular repos on f39 --- nvidia-install.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nvidia-install.sh b/nvidia-install.sh index d4fce91..5415ba1 100755 --- a/nvidia-install.sh +++ b/nvidia-install.sh @@ -2,7 +2,11 @@ set -ouex pipefail -sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-{cisco-openh264,modular,updates-modular}.repo +if [[ "${FEDORA_MAJOR_VERSION}" -le 38 ]]; then + sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-{cisco-openh264,modular,updates-modular}.repo +else + sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-cisco-openh264.repo +fi rpm-ostree install \ /tmp/akmods-rpms/ublue-os/ublue-os-nvidia-addons-*.rpm From a3fc8fd0fe0213eb4e3f4d8c9cb1df8c9d346633 Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Tue, 19 Sep 2023 08:24:25 -0600 Subject: [PATCH 9/9] fix(ci): Filter vauxite from f39 via image_name --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 08e4a09..859e0bb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,14 +43,14 @@ jobs: # When F38 is added, sericea will automatically be built too - image_name: sericea major_version: 37 + - image_name: vauxite + major_version: 39 - image_flavor: main nvidia_version: 470 - image_flavor: main nvidia_version: 535 - image_flavor: nvidia nvidia_version: 0 - - image_flavor: vauxite - major_version: 39 steps: # Checkout push-to-registry action GitHub repository - name: Checkout Push to Registry action