rpms/vim
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f26' into f27

Browse Source
This commit is contained in:
Zdenek Dohnal 2017-09-14 14:09:02 +02:00
commit 54e6ff7fee
2 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
vim-update.sh
View File

@ -86,16 +86,22 @@ if [ $CHANGES -ne 0 ]; then
exit 1 exit 1
fi fi
# Check if release has pending or testing update - if not, build package # Check if release has pending or testing update - if not, build package
# and submit update for testing
pending_update=`bodhi updates query --packages vim --status pending \ pending_update=`bodhi updates query --packages vim --status pending \
| grep $releases` | grep $releases_regexp`
testing_update=`bodhi updates query --packages vim --status testing \ testing_update=`bodhi updates query --packages vim --status testing \
| grep $releases` | grep $releases_regexp`
if [ "$pending_update" == "" ] && [ "$testing_update" == "" ]; then if [ "$pending_update" == "" ] && [ "$testing_update" == "" ]; then
fedpkg build --nowait fedpkg build
if [ $? -eq 0 ]; then
bodhi updates new --user zdohnal --type enhancement --notes "The newest \ bodhi updates new --user zdohnal --type enhancement --notes "The newest \
upstream commit" --request testing --autokarma --stable-karma 3 \ upstream commit" --request testing --autokarma --stable-karma 3 \
--unstable-karma -3 vim-${UPSTREAMMAJOR}-${LASTPLFILLED}-1.\ --unstable-karma -3 vim-${UPSTREAMMAJOR}-${LASTPLFILLED}-1.\
${releases[@]: $branches_index: 1} ${releases[@]: $branches_index: 1}
else
echo "Error when building package in $branch"
exit 1
fi
else else
echo "There are pending/testing updates, do not build package." echo "There are pending/testing updates, do not build package."
fi fi
@ -126,18 +132,24 @@ if [ $CHANGES -ne 0 ]; then
exit 1 exit 1
fi fi
# Check if release has pending or testing update - if not, build package # Check if release has pending or testing update - if not, build package
# and submit update for testing
pending_update=`bodhi updates query --packages vim --status pending \ pending_update=`bodhi updates query --packages vim --status pending \
| grep $releases` | grep $releases_regexp`
testing_update=`bodhi updates query --packages vim --status testing \ testing_update=`bodhi updates query --packages vim --status testing \
| grep $releases` | grep $releases_regexp`
if [ "$pending_update" == "" ] && [ "$testing_update" == "" ]; then if [ "$pending_update" == "" ] && [ "$testing_update" == "" ]; then
fedpkg build --nowait fedpkg build
if [ $? -eq 0 ]; then
if [ ${branches[@]: $branches_index: 1} != "master" ]; then if [ ${branches[@]: $branches_index: 1} != "master" ]; then
bodhi updates new --user zdohnal --type enhancement --notes "The newest \ bodhi updates new --user zdohnal --type enhancement --notes "The newest \
upstream commit" --request testing --autokarma --stable-karma 3 \ upstream commit" --request testing --autokarma --stable-karma 3 \
--unstable-karma -3 vim-${UPSTREAMMAJOR}-${LASTPLFILLED}-1.\ --unstable-karma -3 vim-${UPSTREAMMAJOR}-${LASTPLFILLED}-1.\
${releases[@]: $branches_index: 1} ${releases[@]: $branches_index: 1}
fi fi
else
echo "Error when building package for $branch"
exit 1
fi
fi fi
# Increment index and cut first release # Increment index and cut first release

1
vim.spec
View File

@ -775,6 +775,7 @@ rm -rf %{buildroot}
%changelog %changelog
* Thu Sep 14 2017 Karsten Hopp <karsten@redhat.com> 8.0.1102-1 * Thu Sep 14 2017 Karsten Hopp <karsten@redhat.com> 8.0.1102-1
- vim-update.sh - add test for succesful build and fixing grepping of update's list
- patchlevel 1102 - patchlevel 1102
* Wed Sep 13 2017 Karsten Hopp <karsten@redhat.com> 8.0.1098-1 * Wed Sep 13 2017 Karsten Hopp <karsten@redhat.com> 8.0.1098-1