feat(ci): turn on F41 builds (#1801)
Co-authored-by: Robert Sturla <robertsturla@outlook.com>
This commit is contained in:
parent
49c8291028
commit
7b049bd2f8
7 changed files with 75 additions and 39 deletions
32
.github/workflows/build-beta-aurora.yml
vendored
32
.github/workflows/build-beta-aurora.yml
vendored
|
|
@ -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:
|
||||
|
|
|
|||
32
.github/workflows/build-beta-bluefin.yml
vendored
32
.github/workflows/build-beta-bluefin.yml
vendored
|
|
@ -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:
|
||||
|
|
|
|||
10
.github/workflows/reusable-build.yml
vendored
10
.github/workflows/reusable-build.yml
vendored
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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": []
|
||||
"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": []
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue