(couchdb-ci) branch fix-up-noble-numbat updated (fcdd5c2 -> ddd44a5)

[va...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vatamane pushed a change to branch fix-up-noble-numbat
in repository https://gitbox.apache.org/repos/asf/couchdb-ci.git


 discard fcdd5c2  Fix up noble-numbat install npm and fakeroot
     new ddd44a5  Fix up noble-numbat install npm and fakeroot

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (fcdd5c2)
            \
             N -- N -- N   refs/heads/fix-up-noble-numbat (ddd44a5)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 bin/apt-dependencies.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(couchdb-ci) 01/01: Fix up noble-numbat install npm and fakeroot

[va...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vatamane pushed a commit to branch fix-up-noble-numbat
in repository https://gitbox.apache.org/repos/asf/couchdb-ci.git

commit ddd44a50dc89405f501e7f75fbb5ea539f8e6c14
Author: Nick Vatamaniuc <va...@apache.org>
AuthorDate: Mon Dec 9 18:29:23 2024 -0500

    Fix up noble-numbat install npm and fakeroot
    
    Also don't need to look for createrepo any longer. None of the deb
    distros have nowadays.
---
 bin/apt-dependencies.sh | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/bin/apt-dependencies.sh b/bin/apt-dependencies.sh
index d79d53d..7677ab7 100755
--- a/bin/apt-dependencies.sh
+++ b/bin/apt-dependencies.sh
@@ -69,24 +69,21 @@ apt-get install --no-install-recommends -y apt-transport-https curl git pkg-conf
     libicu-dev libnspr4-dev \
     help2man curl debhelper devscripts dh-exec dh-python equivs \
     dialog equivs lintian libwww-perl quilt \
-    reprepro rsync \
+    reprepro fakeroot rsync \
     vim-tiny screen procps dirmngr ssh-client
 
 
-# createrepo_c or createrepo, depending on packaging support
-if [ "${VERSION_CODENAME}" == "noble" ] || [ "${VERSION_CODENAME}" == "bullseye" ] || [ "${VERSION_CODENAME}" == "bookworm" ]; then
-  apt-get install --no-install-recommends -y createrepo-c || true
-else
-  # python 2 based; gone from focal / bullseye / bookworm. look for createrepo_c eventually
-  # hopefully via: https://github.com/rpm-software-management/createrepo_c/issues/145
-  apt-get install --no-install-recommends -y createrepo || true
-fi
+# createrepo_c is optional, all distros have it except focal
+# once focal is dropped can just added to the list above
+#
+apt-get install --no-install-recommends -y createrepo-c || true
+
 
 # Node.js (ubuntu noble has version 18, otherwise build a package)
 
 if [ "${VERSION_CODENAME}" == "noble" ] && [ "${NODEVERSION}" == "18" ]; then
     echo "--- Ubuntu Noble (24.04) has NodeJS 18 so we just install it from there"
-    apt-get install --no-install-recommends -y nodejs
+    apt-get install --no-install-recommends -y nodejs npm
 else
     wget https://deb.nodesource.com/setup_${NODEVERSION}.x
     if /bin/bash setup_${NODEVERSION}.x; then