From 7b049bd2f804599ce943c88809bd24eac78f3cc6 Mon Sep 17 00:00:00 2001 From: "Jorge O. Castro" Date: Sat, 19 Oct 2024 20:24:49 -0400 Subject: [PATCH] feat(ci): turn on F41 builds (#1801) Co-authored-by: Robert Sturla --- .github/workflows/build-beta-aurora.yml | 32 ++++++++++++------------ .github/workflows/build-beta-bluefin.yml | 32 ++++++++++++------------ .github/workflows/reusable-build.yml | 10 ++++++++ build_files/bluefin-changes.sh | 6 ++++- build_files/bootc.sh | 2 +- build_files/copr-repos.sh | 2 +- packages.json | 28 ++++++++++++++++++--- 7 files changed, 74 insertions(+), 38 deletions(-) diff --git a/.github/workflows/build-beta-aurora.yml b/.github/workflows/build-beta-aurora.yml index 16b4efbc8ee..6c90214bc2e 100644 --- a/.github/workflows/build-beta-aurora.yml +++ b/.github/workflows/build-beta-aurora.yml @@ -1,21 +1,21 @@ name: Aurora Beta on: - # merge_group: - # pull_request: - # branches: - # - main - # - testing - # paths-ignore: - # - "**.md" - # - "system_files/silverblue/**" - # push: - # branches: - # - main - # paths-ignore: - # - "**.md" - # - "system_files/silverblue/**" - # schedule: - # - cron: "40 4 * * *" # 4:40 UTC everyday + merge_group: + pull_request: + branches: + - main + - testing + paths-ignore: + - "**.md" + - "system_files/silverblue/**" + push: + branches: + - main + paths-ignore: + - "**.md" + - "system_files/silverblue/**" + schedule: + - cron: "40 4 * * *" # 4:40 UTC everyday workflow_dispatch: jobs: diff --git a/.github/workflows/build-beta-bluefin.yml b/.github/workflows/build-beta-bluefin.yml index 14d80080f8f..495750c97ee 100644 --- a/.github/workflows/build-beta-bluefin.yml +++ b/.github/workflows/build-beta-bluefin.yml @@ -1,21 +1,21 @@ name: Bluefin Beta on: - # merge_group: - # pull_request: - # branches: - # - main - # - testing - # paths-ignore: - # - "**.md" - # - "system_files/silverblue/**" - # push: - # branches: - # - main - # paths-ignore: - # - "**.md" - # - "system_files/silverblue/**" - # schedule: - # - cron: "40 4 * * *" # 4:40 UTC everyday + merge_group: + pull_request: + branches: + - main + - testing + paths-ignore: + - "**.md" + - "system_files/silverblue/**" + push: + branches: + - main + paths-ignore: + - "**.md" + - "system_files/silverblue/**" + schedule: + - cron: "40 4 * * *" # 4:40 UTC everyday workflow_dispatch: jobs: diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index b7bd37893c4..2c5ebd3e7fd 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -211,21 +211,25 @@ jobs: IS_LATEST_VERSION=false IS_STABLE_VERSION=true IS_GTS_VERSION=false + IS_BETA_VERSION=false IS_COREOS=true elif [[ "${{ matrix.fedora_version }}" == "gts" ]]; then IS_LATEST_VERSION=false IS_STABLE_VERSION=true IS_GTS_VERSION=true + IS_BETA_VERSION=false IS_COREOS=false elif [[ "${{ matrix.fedora_version }}" == "latest" ]]; then IS_LATEST_VERSION=true IS_STABLE_VERSION=true IS_GTS_VERSION=false + IS_BETA_VERSION=false IS_COREOS=false elif [[ "${{ matrix.fedora_version }}" == "beta" ]]; then IS_LATEST_VERSION=false IS_STABLE_VERSION=false IS_GTS_VERSION=false + IS_BETA_VERSION=true IS_COREOS=false fi @@ -269,6 +273,9 @@ jobs: elif [[ "$IS_GTS_VERSION" == "true" ]]; then BUILD_TAGS+=("gts-testing") echo "DEFAULT_TAG=gts-testing" >> $GITHUB_ENV + elif [[ "$IS_BETA_VERSION" == "true" ]]; then + BUILD_TAGS+=("beta-testing") + echo "DEFAULT_TAG=beta-testing" >> $GITHUB_ENV elif [[ "$IS_COREOS" == "true" ]]; then echo "DEFAULT_TAG=stable-testing" >> $GITHUB_ENV fi @@ -280,6 +287,9 @@ jobs: elif [[ "$IS_GTS_VERSION" == "true" ]]; then BUILD_TAGS+=("gts") echo "DEFAULT_TAG=gts" >> $GITHUB_ENV + elif [[ "$IS_BETA_VERSION" == "true" ]]; then + BUILD_TAGS+=("beta") + echo "DEFAULT_TAG=beta" >> $GITHUB_ENV elif [[ "$IS_COREOS" == "true" ]]; then echo "DEFAULT_TAG=stable-daily" >> $GITHUB_ENV fi diff --git a/build_files/bluefin-changes.sh b/build_files/bluefin-changes.sh index 5c64682a8f4..3efabb80fd0 100755 --- a/build_files/bluefin-changes.sh +++ b/build_files/bluefin-changes.sh @@ -10,7 +10,11 @@ if [[ "${BASE_IMAGE_NAME}" = "silverblue" ]]; then if [[ -f /usr/share/applications/org.gnome.SystemMonitor.desktop ]]; then sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nHidden=true@g' /usr/share/applications/org.gnome.SystemMonitor.desktop fi - sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/org.gnome.Terminal.desktop\ + + # GNOME Terminal is replaced with Ptyxis in F41+ + if [[ "${FEDORA_MAJOR_VERSION}" -lt "41" ]]; then + sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/org.gnome.Terminal.desktop + fi # Create symlinks from old to new wallpaper names for backwards compatibility ln -s "/usr/share/backgrounds/bluefin/01-bluefin.xml" "/usr/share/backgrounds/bluefin/bluefin-winter-dynamic.xml" diff --git a/build_files/bootc.sh b/build_files/bootc.sh index 31e1db532f9..55c971b6448 100755 --- a/build_files/bootc.sh +++ b/build_files/bootc.sh @@ -1,5 +1,5 @@ #!/usr/bin/bash -if [ "$FEDORA_MAJOR_VERSION" -ge "40" ]; then +if [ "$FEDORA_MAJOR_VERSION" -eq "40" ]; then /usr/bin/bootupctl backend generate-update-metadata fi diff --git a/build_files/copr-repos.sh b/build_files/copr-repos.sh index f51856cbba3..dc59225d0ee 100755 --- a/build_files/copr-repos.sh +++ b/build_files/copr-repos.sh @@ -59,7 +59,7 @@ elif [[ "${BASE_IMAGE_NAME}" = "kinoite" ]]; then fi # GNOME Triple Buffering -if [[ "${BASE_IMAGE_NAME}" = "silverblue" && "${FEDORA_MAJOR_VERSION}" -gt "39" ]]; then +if [[ "${BASE_IMAGE_NAME}" = "silverblue" && "${FEDORA_MAJOR_VERSION}" -gt "39" && "${FEDORA_MAJOR_VERSION}" -ne "41" ]]; then rpm-ostree override replace \ --experimental \ --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging \ diff --git a/packages.json b/packages.json index b8fa2248f40..aa8faab566d 100644 --- a/packages.json +++ b/packages.json @@ -127,8 +127,6 @@ "libvirt", "libvirt-nss", "lxc", - "lxd-agent", - "lxd", "mozilla-fira-mono-fonts", "nicstat", "numactl", @@ -191,6 +189,8 @@ "fmt" ], "dx": [ + "lxd-agent", + "lxd", "distrobuilder", "podman-plugins" ] @@ -198,6 +198,7 @@ "exclude": { "all": [], "silverblue": [], + "kinoite": [], "dx": [] } }, @@ -207,13 +208,34 @@ "ptyxis" ], "silverblue": [], + "dx": [ + "lxd-agent", + "lxd" + ] + }, + "exclude": { + "all": [], + "silverblue": [], + "kinoite": [], "dx": [] + } + }, + "41": { + "include": { + "all": [], + "kinoite": [ + "ptyxis" + ], + "silverblue": [] }, "exclude": { "all": [], "silverblue": [], + "kinoite": [ + "plasma-welcome", + "plasma-welcome-fedora" + ], "dx": [] } } - }