diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2d80a4d..859e0bb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,15 +21,21 @@ jobs: matrix: image_flavor: [main, nvidia] image_name: [silverblue, kinoite, vauxite, sericea, base, lxqt, mate] - major_version: [37, 38] + major_version: [37, 38, 39] nvidia_version: [0, 470, 535] include: - 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: @@ -37,13 +43,15 @@ 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 - steps: + steps: # Checkout push-to-registry action GitHub repository - name: Checkout Push to Registry action uses: actions/checkout@v4 @@ -103,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 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..b072782 100755 --- a/main-install.sh +++ b/main-install.sh @@ -30,12 +30,15 @@ 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 + 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..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", @@ -45,8 +44,7 @@ ], "silverblue": [ "adw-gtk3-theme", - "gnome-tweaks", - "raw-thumbnailer" + "gnome-tweaks" ], "kinoite": [ "icoutils", @@ -175,7 +173,6 @@ "pipewire-alsa", "pipewire-pulseaudio", "pluma", - "raw-thumbnailer", "seahorse", "seahorse-caja", "setroubleshoot", @@ -193,7 +190,6 @@ "clipman" ], "vauxite": [ - "raw-thumbnailer", "xfce4-clipman-plugin", "xfce4-whiskermenu-plugin" ] @@ -224,12 +220,21 @@ }, "37": { "include": { - "all": [], + "all": [ + "google-noto-sans-cjk-fonts" + ], + "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": { @@ -238,16 +243,35 @@ }, "38": { "include": { - "all": [], + "all": [ + "google-noto-sans-cjk-fonts" + ], + "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": { "all": [] } + }, + "39": { + "include": { + "all": [] + }, + "exclude": { + "all": [ + "default-fonts-cjk-sans" + ] + } } } 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