diff --git a/Makefile b/Makefile index 476248c..d607c8e 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ define rpmbuild -D '_sourcedir %_topdir' \ -D '_specdir %_topdir' \ -D '_srcrpmdir %_topdir' \ - + $(RPMBUILD_ARGS) endef rpm: $(O)/$(ARCH)/$(RPM) diff --git a/ci/build.sh b/ci/build.sh index 39b53c2..1ad13cd 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -3,4 +3,4 @@ install -o 1000 -g 1000 -d f${FEDORA} setpriv --reuid 1000 --regid 1000 --keep-groups \ -make O=f${FEDORA} srpm rpm +make O=f${FEDORA} RPMBUILD_ARGS="-D '_rpmautospec_release_number ${BUILD_NUMBER}'" srpm rpm diff --git a/notify-online.sh b/notify-online.sh index 24fa5e3..beea9bf 100644 --- a/notify-online.sh +++ b/notify-online.sh @@ -9,5 +9,15 @@ if [ -r "${fw_cfg}" ]; then set -- "$@" -F branch="$(cat "${fw_cfg}")" fi +set -- "$(cat /proc/cmdline)" +while [ $# -gt 0 ]; do + case "$1" in + dch.cfg-branch=*) + set -- "$@" -F branch="${1#*=}" + ;; + esac + shift +done + cat /etc/ssh/ssh_host_*_key.pub \ | curl -fsS https://webhooks.pyrocufflink.blue/host/online "$@"