feat(ci): turn on F41 builds (#1801)

Co-authored-by: Robert Sturla <robertsturla@outlook.com>
This commit is contained in:
Jorge O. Castro 2024-10-19 20:24:49 -04:00 committed by GitHub
parent 49c8291028
commit 7b049bd2f8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 75 additions and 39 deletions

View file

@ -1,21 +1,21 @@
name: Aurora Beta name: Aurora Beta
on: on:
# merge_group: merge_group:
# pull_request: pull_request:
# branches: branches:
# - main - main
# - testing - testing
# paths-ignore: paths-ignore:
# - "**.md" - "**.md"
# - "system_files/silverblue/**" - "system_files/silverblue/**"
# push: push:
# branches: branches:
# - main - main
# paths-ignore: paths-ignore:
# - "**.md" - "**.md"
# - "system_files/silverblue/**" - "system_files/silverblue/**"
# schedule: schedule:
# - cron: "40 4 * * *" # 4:40 UTC everyday - cron: "40 4 * * *" # 4:40 UTC everyday
workflow_dispatch: workflow_dispatch:
jobs: jobs:

View file

@ -1,21 +1,21 @@
name: Bluefin Beta name: Bluefin Beta
on: on:
# merge_group: merge_group:
# pull_request: pull_request:
# branches: branches:
# - main - main
# - testing - testing
# paths-ignore: paths-ignore:
# - "**.md" - "**.md"
# - "system_files/silverblue/**" - "system_files/silverblue/**"
# push: push:
# branches: branches:
# - main - main
# paths-ignore: paths-ignore:
# - "**.md" - "**.md"
# - "system_files/silverblue/**" - "system_files/silverblue/**"
# schedule: schedule:
# - cron: "40 4 * * *" # 4:40 UTC everyday - cron: "40 4 * * *" # 4:40 UTC everyday
workflow_dispatch: workflow_dispatch:
jobs: jobs:

View file

@ -211,21 +211,25 @@ jobs:
IS_LATEST_VERSION=false IS_LATEST_VERSION=false
IS_STABLE_VERSION=true IS_STABLE_VERSION=true
IS_GTS_VERSION=false IS_GTS_VERSION=false
IS_BETA_VERSION=false
IS_COREOS=true IS_COREOS=true
elif [[ "${{ matrix.fedora_version }}" == "gts" ]]; then elif [[ "${{ matrix.fedora_version }}" == "gts" ]]; then
IS_LATEST_VERSION=false IS_LATEST_VERSION=false
IS_STABLE_VERSION=true IS_STABLE_VERSION=true
IS_GTS_VERSION=true IS_GTS_VERSION=true
IS_BETA_VERSION=false
IS_COREOS=false IS_COREOS=false
elif [[ "${{ matrix.fedora_version }}" == "latest" ]]; then elif [[ "${{ matrix.fedora_version }}" == "latest" ]]; then
IS_LATEST_VERSION=true IS_LATEST_VERSION=true
IS_STABLE_VERSION=true IS_STABLE_VERSION=true
IS_GTS_VERSION=false IS_GTS_VERSION=false
IS_BETA_VERSION=false
IS_COREOS=false IS_COREOS=false
elif [[ "${{ matrix.fedora_version }}" == "beta" ]]; then elif [[ "${{ matrix.fedora_version }}" == "beta" ]]; then
IS_LATEST_VERSION=false IS_LATEST_VERSION=false
IS_STABLE_VERSION=false IS_STABLE_VERSION=false
IS_GTS_VERSION=false IS_GTS_VERSION=false
IS_BETA_VERSION=true
IS_COREOS=false IS_COREOS=false
fi fi
@ -269,6 +273,9 @@ jobs:
elif [[ "$IS_GTS_VERSION" == "true" ]]; then elif [[ "$IS_GTS_VERSION" == "true" ]]; then
BUILD_TAGS+=("gts-testing") BUILD_TAGS+=("gts-testing")
echo "DEFAULT_TAG=gts-testing" >> $GITHUB_ENV 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 elif [[ "$IS_COREOS" == "true" ]]; then
echo "DEFAULT_TAG=stable-testing" >> $GITHUB_ENV echo "DEFAULT_TAG=stable-testing" >> $GITHUB_ENV
fi fi
@ -280,6 +287,9 @@ jobs:
elif [[ "$IS_GTS_VERSION" == "true" ]]; then elif [[ "$IS_GTS_VERSION" == "true" ]]; then
BUILD_TAGS+=("gts") BUILD_TAGS+=("gts")
echo "DEFAULT_TAG=gts" >> $GITHUB_ENV 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 elif [[ "$IS_COREOS" == "true" ]]; then
echo "DEFAULT_TAG=stable-daily" >> $GITHUB_ENV echo "DEFAULT_TAG=stable-daily" >> $GITHUB_ENV
fi fi

View file

@ -10,7 +10,11 @@ if [[ "${BASE_IMAGE_NAME}" = "silverblue" ]]; then
if [[ -f /usr/share/applications/org.gnome.SystemMonitor.desktop ]]; 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 sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nHidden=true@g' /usr/share/applications/org.gnome.SystemMonitor.desktop
fi 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 # 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" ln -s "/usr/share/backgrounds/bluefin/01-bluefin.xml" "/usr/share/backgrounds/bluefin/bluefin-winter-dynamic.xml"

View file

@ -1,5 +1,5 @@
#!/usr/bin/bash #!/usr/bin/bash
if [ "$FEDORA_MAJOR_VERSION" -ge "40" ]; then if [ "$FEDORA_MAJOR_VERSION" -eq "40" ]; then
/usr/bin/bootupctl backend generate-update-metadata /usr/bin/bootupctl backend generate-update-metadata
fi fi

View file

@ -59,7 +59,7 @@ elif [[ "${BASE_IMAGE_NAME}" = "kinoite" ]]; then
fi fi
# GNOME Triple Buffering # 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 \ rpm-ostree override replace \
--experimental \ --experimental \
--from repo=copr:copr.fedorainfracloud.org:ublue-os:staging \ --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging \

View file

@ -127,8 +127,6 @@
"libvirt", "libvirt",
"libvirt-nss", "libvirt-nss",
"lxc", "lxc",
"lxd-agent",
"lxd",
"mozilla-fira-mono-fonts", "mozilla-fira-mono-fonts",
"nicstat", "nicstat",
"numactl", "numactl",
@ -191,6 +189,8 @@
"fmt" "fmt"
], ],
"dx": [ "dx": [
"lxd-agent",
"lxd",
"distrobuilder", "distrobuilder",
"podman-plugins" "podman-plugins"
] ]
@ -198,6 +198,7 @@
"exclude": { "exclude": {
"all": [], "all": [],
"silverblue": [], "silverblue": [],
"kinoite": [],
"dx": [] "dx": []
} }
}, },
@ -207,13 +208,34 @@
"ptyxis" "ptyxis"
], ],
"silverblue": [], "silverblue": [],
"dx": [] "dx": [
"lxd-agent",
"lxd"
]
}, },
"exclude": { "exclude": {
"all": [], "all": [],
"silverblue": [], "silverblue": [],
"kinoite": [],
"dx": []
}
},
"41": {
"include": {
"all": [],
"kinoite": [
"ptyxis"
],
"silverblue": []
},
"exclude": {
"all": [],
"silverblue": [],
"kinoite": [
"plasma-welcome",
"plasma-welcome-fedora"
],
"dx": [] "dx": []
} }
} }
} }