diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-03 14:01:37 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-03 14:01:37 +0000 |
| commit | 734d725d62d2cbe4445524448de024e3b9e7f4b3 (patch) | |
| tree | 88d8385f24a0efda248b3480fe39037b85e76552 /tools/test-github.sh | |
| parent | Releasing progress-linux version 060+5-8~progress7.99u1. (diff) | |
| download | dracut-734d725d62d2cbe4445524448de024e3b9e7f4b3.tar.xz dracut-734d725d62d2cbe4445524448de024e3b9e7f4b3.zip | |
Merging upstream version 102.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tools/test-github.sh')
| -rwxr-xr-x | tools/test-github.sh | 19 |
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"} \ |