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.
This commit is contained in:
2026-02-18 12:41:33 -07:00
parent 9e42c0dcc4
commit 7b0d574752

View File

@@ -65,7 +65,11 @@ jobs:
# Do not remove openssl-11 here: it can trigger a very large # Do not remove openssl-11 here: it can trigger a very large
# dependency cascade (including python3/eopkg itself), which # dependency cascade (including python3/eopkg itself), which
# breaks the build environment before package build starts. # 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" ypkg build "$PACKAGE_YML"
mkdir -p /workspace/artifacts mkdir -p /workspace/artifacts
find . -maxdepth 3 -name "*.eopkg" -type f -exec cp -v {} /workspace/artifacts/ \; find . -maxdepth 3 -name "*.eopkg" -type f -exec cp -v {} /workspace/artifacts/ \;