Skip to content

Commit 27e6eae

Browse files
feat(stability): remove support for Clear Linux (#2391)
1 parent 8e8b46f commit 27e6eae

7 files changed

Lines changed: 6 additions & 102 deletions

File tree

.github/workflows/push_release_images.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,18 @@ jobs:
1818
container:
1919
- gentoo
2020
- alpine
21-
# TODO: fix issue 2316
22-
# - amazonlinux
2321
- archlinux
24-
- clearlinux
2522
- debian
2623
- fedora
2724
- kali
2825
- manjarolinux
2926
- opensuse-leap
27+
- sles
28+
# TODO: fix issue 2316
29+
# - amazonlinux
3030
# - oraclelinux
3131
# - redhat-ubi9
3232
# - rockylinux
33-
- sles
3433
steps:
3534
- name: Checkout with history to get latest tag
3635
if: ${{ github.event_name != 'release' }}

.github/workflows/validation.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -427,20 +427,19 @@ jobs:
427427
max-parallel: 8
428428
matrix:
429429
include:
430-
- { container: openSUSE, dockerfile: Dockerfile_opensuse-leap }
431-
- { container: Oracle Linux, dockerfile: Dockerfile_oraclelinux }
432-
- { container: SUSE Enterprise, dockerfile: Dockerfile_sles }
433430
- { container: Gentoo, dockerfile: Dockerfile_gentoo }
434431
- { container: Alpine, dockerfile: Dockerfile_alpine }
435432
- { container: Amazon Linux, dockerfile: Dockerfile_amazonlinux }
436433
- { container: Arch, dockerfile: Dockerfile_archlinux }
437-
- { container: Clear Linux, dockerfile: Dockerfile_clearlinux }
438434
- { container: Debian, dockerfile: Dockerfile_debian }
439435
- { container: Fedora, dockerfile: Dockerfile_fedora }
440436
- { container: Kali, dockerfile: Dockerfile_kali }
441437
- { container: Manjaro, dockerfile: Dockerfile_manjarolinux }
438+
- { container: openSUSE, dockerfile: Dockerfile_opensuse-leap }
439+
- { container: Oracle Linux, dockerfile: Dockerfile_oraclelinux }
442440
- { container: Red Hat Enterprise, dockerfile: Dockerfile_redhat-ubi9 }
443441
- { container: Rocky Linux, dockerfile: Dockerfile_rockylinux }
442+
- { container: SUSE Enterprise, dockerfile: Dockerfile_sles }
444443
- { container: Ubuntu, dockerfile: Dockerfile }
445444
steps:
446445
- uses: actions/checkout@v5

docker/Dockerfile_clearlinux

Lines changed: 0 additions & 23 deletions
This file was deleted.

nodebuilder

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -569,9 +569,6 @@ ensure_curl_dependency()
569569
suse | sles | *opensuse*)
570570
sudo zypper --non-interactive --quiet install curl > /dev/null
571571
;;
572-
clear-linux-os)
573-
sudo swupd bundle-add curl > /dev/null
574-
;;
575572
Darwin)
576573
throw_error "Please install the 'curl' dependency."
577574
;;
@@ -636,9 +633,6 @@ ensure_sudo_dependency()
636633
suse | sles | *opensuse*)
637634
zypper --non-interactive --quiet install sudo > /dev/null
638635
;;
639-
clear-linux-os)
640-
swupd bundle-add sudo > /dev/null
641-
;;
642636
FreeBSD)
643637
pkg install -y sudo > /dev/null
644638
;;
@@ -698,9 +692,6 @@ ensure_xargs_dependency()
698692
suse | sles | *opensuse*)
699693
zypper --non-interactive --quiet install findutils > /dev/null
700694
;;
701-
clear-linux-os)
702-
swupd bundle-add findutils > /dev/null
703-
;;
704695
FreeBSD)
705696
sudo pkg install -y findutils > /dev/null
706697
;;
@@ -822,9 +813,6 @@ install_build_dependencies()
822813
suse | sles | *opensuse*)
823814
install_build_dependencies_zypper
824815
;;
825-
clear-linux-os)
826-
install_build_dependencies_swupd
827-
;;
828816
Darwin)
829817
install_build_dependencies_darwin
830818
;;
@@ -845,7 +833,6 @@ install_build_dependencies()
845833
dnf \
846834
emerge \
847835
pacman \
848-
swupd \
849836
zypper; do
850837
if command -v "${package_manager}" > /dev/null; then
851838
install_build_command_function="install_build_dependencies_$(echo "${package_manager}" | tr -d '-')"
@@ -1005,16 +992,6 @@ install_build_dependencies_pacman()
1005992
grep -v 'skipping' "${STDERR_COMPILE_LOG_FILE}" >&2 || true
1006993
}
1007994

1008-
install_build_dependencies_swupd()
1009-
{
1010-
readonly BUILD_DEPENDENCIES_URL="${DEPENDENCIES_BASE_URL}/build_dependencies_swupd.txt"
1011-
command -v torsocks > /dev/null 2>&1 &&
1012-
dependencies=$(torsocks curl --fail --silent --show-error --location --retry 2 "${BUILD_DEPENDENCIES_URL}") ||
1013-
dependencies=$(curl --fail --silent --show-error --location --retry 5 "${BUILD_DEPENDENCIES_URL}")
1014-
[ -z "${dependencies:-}" ] && throw_error "The list of dependencies is empty."
1015-
printf '%s\n' "${dependencies}" | tr -d '\r' | xargs sudo swupd bundle-add --quiet > /dev/null
1016-
}
1017-
1018995
install_build_dependencies_zypper()
1019996
{
1020997
readonly BUILD_DEPENDENCIES_URL="${DEPENDENCIES_BASE_URL}/build_dependencies_zypper.txt"
@@ -1048,9 +1025,6 @@ install_runtime_dependencies()
10481025
suse | sles | *opensuse*)
10491026
install_runtime_dependencies_zypper
10501027
;;
1051-
clear-linux-os)
1052-
install_runtime_dependencies_swupd
1053-
;;
10541028
Darwin)
10551029
install_runtime_dependencies_darwin
10561030
;;
@@ -1071,7 +1045,6 @@ install_runtime_dependencies()
10711045
dnf \
10721046
emerge \
10731047
pacman \
1074-
swupd \
10751048
zypper; do
10761049
if command -v "${package_manager}" > /dev/null; then
10771050
install_runtime_command_function="install_runtime_dependencies_$(echo "${package_manager}" | tr -d '-')"
@@ -1211,16 +1184,6 @@ install_runtime_dependencies_pacman()
12111184
rm "${STDERR_DEPENDENCIES_LOG_FILE}"
12121185
}
12131186

1214-
install_runtime_dependencies_swupd()
1215-
{
1216-
readonly RUNTIME_DEPENDENCIES_URL="${DEPENDENCIES_BASE_URL}/runtime_dependencies_swupd.txt"
1217-
command -v torsocks > /dev/null 2>&1 &&
1218-
dependencies=$(torsocks curl --fail --silent --show-error --location --retry 2 "${RUNTIME_DEPENDENCIES_URL}") ||
1219-
dependencies=$(curl --fail --silent --show-error --location --retry 5 "${RUNTIME_DEPENDENCIES_URL}")
1220-
[ -z "${dependencies:-}" ] && throw_error 'The list of dependencies is empty.'
1221-
printf '%s\n' "${dependencies}" | tr -d '\r' | xargs sudo swupd bundle-add --quiet > /dev/null
1222-
}
1223-
12241187
install_runtime_dependencies_zypper()
12251188
{
12261189
readonly RUNTIME_DEPENDENCIES_URL="${DEPENDENCIES_BASE_URL}/runtime_dependencies_zypper.txt"
@@ -1253,9 +1216,6 @@ install_system_updates()
12531216
suse | sles | *opensuse*)
12541217
install_system_updates_zypper
12551218
;;
1256-
clear-linux-os)
1257-
install_system_updates_swupd
1258-
;;
12591219
FreeBSD)
12601220
install_system_updates_freebsd
12611221
;;
@@ -1276,8 +1236,6 @@ install_system_updates()
12761236
install_system_updates_emerge
12771237
elif command -v pacman > /dev/null; then
12781238
install_system_updates_pacman
1279-
elif command -v swupd > /dev/null; then
1280-
install_system_updates_swupd
12811239
elif command -v zypper > /dev/null; then
12821240
install_system_updates_zypper
12831241
else
@@ -1377,11 +1335,6 @@ install_system_updates_pacman()
13771335
sudo pacman -Syu --noconfirm --quiet > /dev/null
13781336
}
13791337

1380-
install_system_updates_swupd()
1381-
{
1382-
sudo swupd update --quiet > /dev/null
1383-
}
1384-
13851338
install_system_updates_zypper()
13861339
{
13871340
sudo zypper --non-interactive --quiet dist-upgrade > /dev/null

resources/dependencies/build_dependencies_swupd.txt

Lines changed: 0 additions & 10 deletions
This file was deleted.

resources/dependencies/make_build_dependencies_swupd.txt

Lines changed: 0 additions & 7 deletions
This file was deleted.

resources/dependencies/runtime_dependencies_swupd.txt

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)