Adding upstream version 102.upstream/102

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 7 insertions, 12 deletions

diff --git a/tools/test-github.sh b/tools/test-github.sh
index 4fed092..4a8d318 100755
--- a/tools/test-github.sh
+++ b/tools/test-github.sh
@@ -7,21 +7,17 @@ set -ex
 RUN_ID="$1"
 TESTS=$2
 
-./configure
+# if is cargo installed, let's build and test dracut-cpio
+if command -v cargo > /dev/null; then
+    ./configure --enable-dracut-cpio
+else
+    ./configure
+fi
 
 NCPU=$(getconf _NPROCESSORS_ONLN)
 
 if ! [[ $TESTS ]]; then
-    # GitHub workflows fetch a clone of the dracut repository which doesn't
-    # contain git tags, thus "breaking" the RPM build in certain situations
-    # i.e.:
-    # DRACUT_MAIN_VERSION in Makefile is defined as an output of `git describe`,
-    # which in full git clone returns a tag with a numeric version. However,
-    # without tags it returns SHA of the last commit, which later propagates into
-    # `Provides:` attribute of the built RPM and can break dependency tree when
-    # installed
-    [[ -d .git ]] && git fetch --tags && git describe --tags
-    make -j "$NCPU" all syncheck rpm logtee
+    make -j "$NCPU" all syncheck logtee
 else
     make -j "$NCPU" enable_documentation=no all logtee
 
@@ -34,7 +30,6 @@ else
             cd /lib/modules
             ls -1 | tail -1
         )" \
-        QEMU_CPU="IvyBridge-v2" \
         DRACUT_NO_XATTR=1 \
         TEST_RUN_ID="$RUN_ID" \
         ${TESTS:+TESTS="$TESTS"} \