From f37a75dea2b283b5c6c446ca2c92fb8ee507f84c Mon Sep 17 00:00:00 2001 From: bobslept <38557801+bobslept@users.noreply.github.com> Date: Wed, 8 Nov 2023 17:53:57 +0100 Subject: [PATCH 1/2] feat: mark Fedora 39 as stable (#646) --- .github/workflows/build.yml | 8 +++----- Containerfile | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ee935c4b5be..9c520859bfc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,12 +32,12 @@ jobs: major_version: [38, 39] include: - major_version: 38 - is_latest_version: true + is_latest_version: false is_stable_version: true is_gts_version: true - major_version: 39 is_latest_version: true - is_stable_version: false + is_stable_version: true is_gts_version: false steps: - name: Maximize build space @@ -86,9 +86,7 @@ jobs: if [[ "${{ matrix.is_latest_version }}" == "true" ]] && \ [[ "${{ matrix.is_stable_version }}" == "true" ]]; then BUILD_TAGS+=("latest") - fi - - if [[ "${{ matrix.is_gts_version }}" == "true" ]]; then + elif [[ "${{ matrix.is_gts_version }}" == "true" ]]; then BUILD_TAGS+=("gts") fi diff --git a/Containerfile b/Containerfile index f0aa0517ab8..88e1f502e0b 100644 --- a/Containerfile +++ b/Containerfile @@ -3,7 +3,7 @@ ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}" ARG AKMODS_FLAVOR="${AKMODS_FLAVOR:-main}" ARG SOURCE_IMAGE="${SOURCE_IMAGE:-$BASE_IMAGE_NAME-$IMAGE_FLAVOR}" ARG BASE_IMAGE="ghcr.io/ublue-os/${SOURCE_IMAGE}" -ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}" +ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}" ARG TARGET_BASE="${TARGET_BASE:-bluefin}" ## bluefin image section From 6234165d77792a8fd0725901f0fc74e26b81d9c4 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Wed, 8 Nov 2023 20:47:21 -0800 Subject: [PATCH 2/2] fix: Correct issues with desktop portal (#647) --- usr/lib/systemd/user/ublue-user-setup.service | 1 - 1 file changed, 1 deletion(-) diff --git a/usr/lib/systemd/user/ublue-user-setup.service b/usr/lib/systemd/user/ublue-user-setup.service index c26590a0055..5f18765ecaa 100644 --- a/usr/lib/systemd/user/ublue-user-setup.service +++ b/usr/lib/systemd/user/ublue-user-setup.service @@ -1,6 +1,5 @@ [Unit] Description=Configure system for current user -Requires=xdg-desktop-autostart.target [Service] Type=simple