mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-10-22 15:48:14 +00:00
b74a0f27aa
Two files needed a resolution. Both are unions of independent additions. XCAT::Test::Lifecycle::build_deb takes master's new $source argument and its -xpf extraction, and keeps the control-$arch selection this branch adds for xCAT-genesis-scripts. $source defaults to the repository root, so the branch behaviour does not change. .github/workflows/xcat_test.yml keeps master's profile_package_payload.t on both lifecycle prove lines and master's Perl module list, and keeps this branch's FIPS steps, bzip2 and openssl. Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>