colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rpm/build*.sh: trap failures

Browse Source
This commit is contained in:
Lubomir Rintel
2025-02-04 12:21:43 +01:00
parent 6f9ecc7621
commit 64f8ec6099
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/fedora/rpm/build.sh
View File

@@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
#set -vx #set -vx
set -e
set -o pipefail
# Set arguments via environment variables. # Set arguments via environment variables.
# Argument can be omitted and defaults will be detected. # Argument can be omitted and defaults will be detected.
@@ -115,7 +117,7 @@ COMMIT="${COMMIT:-$(printf '%s' "$COMMIT_FULL" | sed 's/^\(.\{10\}\).*/\1/' || d
BCOND_DEFAULT_DEBUG="${BCOND_DEFAULT_DEBUG:-0}" BCOND_DEFAULT_DEBUG="${BCOND_DEFAULT_DEBUG:-0}"
BCOND_DEFAULT_TEST="${BCOND_DEFAULT_TEST:-0}" BCOND_DEFAULT_TEST="${BCOND_DEFAULT_TEST:-0}"
BCOND_DEFAULT_LTO="${BCOND_DEFAULT_LTO}" BCOND_DEFAULT_LTO="${BCOND_DEFAULT_LTO}"
USERNAME="${USERNAME:-"$(git config user.name) <$(git config user.email)>"}" USERNAME="${USERNAME:-"$(git config user.name || :) <$(git config user.email || :)>"}"
SPECFILE="$(abs_path "$SPECFILE" "$SCRIPTDIR/NetworkManager.spec")" || die "invalid \$SPECFILE argument" SPECFILE="$(abs_path "$SPECFILE" "$SCRIPTDIR/NetworkManager.spec")" || die "invalid \$SPECFILE argument"
SOURCE_FROM_GIT="$(coerce_bool "$SOURCE_FROM_GIT" "")" SOURCE_FROM_GIT="$(coerce_bool "$SOURCE_FROM_GIT" "")"
SOURCE="$(abs_path "$SOURCE")" || die "invalid \$SOURCE argument" SOURCE="$(abs_path "$SOURCE")" || die "invalid \$SOURCE argument"
@@ -262,7 +264,7 @@ ls -dla \
"$TEMP_LATEST"/RPMS/*/*.rpm \ "$TEMP_LATEST"/RPMS/*/*.rpm \
"$TEMP_LATEST"/SRPMS/ \ "$TEMP_LATEST"/SRPMS/ \
"$TEMP_LATEST"/SRPMS/*.rpm \ "$TEMP_LATEST"/SRPMS/*.rpm \
2>/dev/null | sed 's/^/ /' 2>/dev/null | sed 's/^/ /' || :
LOG LOG
if [[ "$BUILDTYPE" == "SRPM" ]]; then if [[ "$BUILDTYPE" == "SRPM" ]]; then
LOG sudo $(command -v dnf &>/dev/null && echo dnf builddep || echo yum-builddep) $TEMP_LATEST/SRPMS/*.src.rpm LOG sudo $(command -v dnf &>/dev/null && echo dnf builddep || echo yum-builddep) $TEMP_LATEST/SRPMS/*.src.rpm

2
contrib/fedora/rpm/build_clean.sh
View File

@@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash
set -e
set -o pipefail
die() { die() {
echo "$*" >&2 echo "$*" >&2