Skip to content

Commit

Permalink
Add Debian 12 Bookworm; ignore core-utils in almalinux (#4836)
Browse files Browse the repository at this point in the history
Add codename `bookworm` to the distro matrix during Artifactory uploads
allowing Debian 12 clients to install `rippled` packages.

Ignore installing conflicting `core-utils` packages during almalinux
package smoke tests.
  • Loading branch information
legleux authored Nov 27, 2023
1 parent 92957d6 commit 2e93dd5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Builds/containers/gitlab-ci/push_to_artifactory.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RIPPLED_REPORTING_DBG_PKG=$(ls rippled-reporting-dbgsym_*.*deb)
# TODO - where to upload src tgz?
RIPPLED_SRC=$(ls rippled_*.orig.tar.gz)
DEB_MATRIX=";deb.component=${COMPONENT};deb.architecture=amd64"
for dist in buster bullseye bionic focal jammy; do
for dist in bookworm buster bullseye bionic focal jammy; do
DEB_MATRIX="${DEB_MATRIX};deb.distribution=${dist}"
done
echo "{ \"debs\": {" > "${TOPDIR}/files.info"
Expand Down
7 changes: 4 additions & 3 deletions Builds/containers/gitlab-ci/smoketest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,10 @@ else
yum -y update
if [ "${install_from}" = "repo" ] ; then
pkgs=("yum-utils coreutils util-linux")
if [ "$ID" = "rocky" ]; then
pkgs="${pkgs[@]/coreutils}"
fi
case "$ID" in
rocky|almalinux)
pkgs="${pkgs[@]/coreutils}"
esac
yum install -y $pkgs
REPOFILE="/etc/yum.repos.d/artifactory.repo"
echo "[Artifactory]" > ${REPOFILE}
Expand Down

0 comments on commit 2e93dd5

Please sign in to comment.