merge: branch 'lr/skip-broken'

Various CI/build fixes

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2135

.gitlab-ci.yml

@@ -61,9 +61,9 @@ variables:
   # This is done by running `ci-fairy generate-template` and possibly bumping
   # ".default_tag".
   ALPINE_TAG:  'tag-77ec3d923fd6'
-  CENTOS_TAG:  'tag-8af9c6a05c7b'
+  CENTOS_TAG:  'tag-7a677f4838e1'
   DEBIAN_TAG:  'tag-ecad19904683'
-  FEDORA_TAG:  'tag-8af9c6a05c7b'
+  FEDORA_TAG:  'tag-7a677f4838e1'
   UBUNTU_TAG:  'tag-ecad19904683'
 
   ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh'

.gitlab-ci/fedora-install.sh

@@ -39,7 +39,7 @@ fi
 fi
 
 
-NM_NO_EXTRA=1 NM_INSTALL="yum install -y" ./contrib/fedora/REQUIRED_PACKAGES
+NM_NO_EXTRA=1 NM_INSTALL="yum install -y --allowerasing" ./contrib/fedora/REQUIRED_PACKAGES
 yum install -y glibc-langpack-pl ccache clang
 
 # containers have "tsflags=nodocs" in /etc/dnf/dnf.conf. We need /usr/shared/gtk-doc/html
@@ -66,8 +66,6 @@ else
     debuginfo-install -y glib2
 fi
 
-contrib/scripts/nm-ci-patch-gtkdoc.sh || true
-
 if [ -x /usr/bin/ninja ] && ! [ -x /usr/bin/ninja-build ]; then
     ln -s /usr/bin/ninja-build /usr/bin/ninja
 fi

contrib/fedora/REQUIRED_PACKAGES

@@ -25,6 +25,12 @@ install() {
     fi
 }
 
+install_ignore_missing() {
+    for p; do
+        install "$p" || :
+    done
+}
+
 if test "$NM_NO_EXTRA" != 1; then
     # these packages are convenient for developing, but not necessary
     # for CI testing.
@@ -82,21 +88,15 @@ install \
     which \
     #end
 
-# Some packages don't exist in certain distributions. Ignore errors
+# some packages don't exist in certain distributions. Install them one-by-one, and ignore errors.
-# installing them, but still drag them in when available.
+install_ignore_missing \
-install --skip-unavailable \
     black \
-    dbus-python \
     dhclient \
     iproute-tc \
     libasan \
     libpsl-devel \
     libubsan \
     libvala-devel \
-    pexpect \
-    pygobject3-base \
-    python-gobject-base \
-    python36-pexpect \
     qt-devel \
     teamd-devel \
     vala-devel \

contrib/fedora/rpm/build.sh

@@ -127,7 +127,7 @@ if [ -n "$SOURCE" ]; then
     [[ "$SOURCE_FROM_GIT" == 1 ]] && die "Cannot set both \$SOURCE and \$SOURCE_FROM_GIT=1"
     SOURCE_FROM_GIT=0
 elif [[ "$SOURCE_FROM_GIT" != "1" ]]; then
-    SOURCE="$(ls -1 "$GITDIR/NetworkManager-${VERSION}.tar."* 2>/dev/null | head -n1)"
+    SOURCE="$(ls -1 "$GITDIR/NetworkManager-${VERSION}.tar."* 2>/dev/null | head -n1 || :)"
     if [[ -z "$SOURCE" ]]; then
         [[ "$SOURCE_FROM_GIT" == "0" ]] && die "Either set \$SOURCE or set \$SOURCE_FROM_GIT=1"
         SOURCE_FROM_GIT=1

contrib/scripts/nm-ci-patch-gtkdoc.sh

@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# patch gtk-doc for https://gitlab.gnome.org/GNOME/gtk-doc/merge_requests/2
-
-cd /
-
-patch -f -p 1 --fuzz 0 --reject-file=- <<EOF
-diff --git a/usr/share/gtk-doc/python/gtkdoc/scan.py b/usr/share/gtk-doc/python/gtkdoc/scan.py
-index f1f167235ab2e4c62676fbcfb87ebbe55c95b944..b59dd17abfa5f42b7bb06d239f9c78e5efffbf5d 100644
---- a/usr/share/gtk-doc/python/gtkdoc/scan.py
-+++ b/usr/share/gtk-doc/python/gtkdoc/scan.py
-@@ -427,20 +427,26 @@ def ScanHeader(input_file, section_list, decl_list, get_types, options):
-             elif m9:
-                 # We've found a 'typedef struct _<name> <name>;'
-                 # This could be an opaque data structure, so we output an
-                 # empty declaration. If the structure is actually found that
-                 # will override this.
-                 structsym = m9.group(1).upper()
-                 logging.info('%s typedef: "%s"', structsym, m9.group(2))
-                 forward_decls[m9.group(2)] = '<%s>\n<NAME>%s</NAME>\n%s</%s>\n' % (
-                     structsym, m9.group(2), deprecated, structsym)
- 
-+                bm = re.search(r'^(\S+)(Class|Iface|Interface)\b', m9.group(2))
-+                if bm:
-+                    objectname = bm.group(1)
-+                    logging.info('Found object: "%s"', objectname)
-+                    title = '<TITLE>%s</TITLE>' % objectname
-+
-             elif re.search(r'^\s*(?:struct|union)\s+_(\w+)\s*;', line):
-                 # Skip private structs/unions.
-                 logging.info('private struct/union')
- 
-             elif m10:
-                 # Do a similar thing for normal structs as for typedefs above.
-                 # But we output the declaration as well in this case, so we
-                 # can differentiate it from a typedef.
-                 structsym = m10.group(1).upper()
-                 logging.info('%s:%s', structsym, m10.group(2))
-EOF
-