From 7b0d5747529dc8d643a342bf80c36c6e3161fc8c Mon Sep 17 00:00:00 2001 From: deepend Date: Wed, 18 Feb 2026 12:41:33 -0700 Subject: [PATCH] Updated the Solus CI workflow to install ypkg/git using eopkg install -y --ignore-file-conflicts ..., which prevents the openssl vs openssl-11 file-conflict failure from aborting the build early. Added explanatory comments in the workflow about why file-conflict tolerance is necessary in some Solus base images. --- .github/workflows/solus-eopkg-build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/solus-eopkg-build.yml b/.github/workflows/solus-eopkg-build.yml index d9a10c31..7fa89fb0 100644 --- a/.github/workflows/solus-eopkg-build.yml +++ b/.github/workflows/solus-eopkg-build.yml @@ -65,7 +65,11 @@ jobs: # 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. - eopkg install -y ypkg git + # 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. + eopkg install -y --ignore-file-conflicts ypkg git ypkg build "$PACKAGE_YML" mkdir -p /workspace/artifacts find . -maxdepth 3 -name "*.eopkg" -type f -exec cp -v {} /workspace/artifacts/ \;