From df37b44cc8ef101ce56f697e64ff0193e1eb64fc Mon Sep 17 00:00:00 2001 From: deepend Date: Wed, 25 Feb 2026 13:01:21 -0700 Subject: [PATCH] Cleaned up unneeded comment noise in the Solus eopkg workflow by replacing an 11-line explanatory block with a concise 2-line comment while preserving the key rationale for --ignore-file-conflicts and required Meson tooling install. --- .github/workflows/solus-eopkg-build.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/solus-eopkg-build.yml b/.github/workflows/solus-eopkg-build.yml index 9166b3ea..873342e9 100644 --- a/.github/workflows/solus-eopkg-build.yml +++ b/.github/workflows/solus-eopkg-build.yml @@ -62,17 +62,8 @@ jobs: sh -lc ' set -euo pipefail eopkg update-repo -y - # Do not remove openssl-11 here: it can trigger a very large - # dependency cascade (including python3/eopkg itself), which - # breaks the build environment before package build starts. - # Some Solus base images still contain openssl-11 files that - # conflict with openssl 3.x when the package set is refreshed. - # Allowing file-conflict resolution keeps the CI image usable - # long enough to install ypkg and complete the package build. - # The base image does not guarantee Meson toolchain packages, - # while our package.yml setup phase calls meson directly. - # Install the essential build tools up front to avoid - # `/tmp/ypkg-setup*: meson: command not found` failures. + # Keep file-conflict handling on: some base images still carry + # openssl-11 leftovers, and Meson tooling is not always preinstalled. eopkg install -y --ignore-file-conflicts \ ypkg git meson ninja pkgconf gcc gettext ypkg build "$PACKAGE_YML"