Stop tag-signing attempt in travis build
At the point they were running a signed tar is already present, the Travis build is not supposed to do this.
Philip Whineray committed
Jan 22, 2017 at 21:13 UTC
aaf3005f176c31ab9a901d7c4d49a91b0a5101e3
1 file changed
+26
-21
packaging/packaging.functions
+26
-21
@@ -124,7 +124,7 @@ get_configure_ac_rpmrel() {
124
}
125
126
get_spec_version() {
127
- get_staged_file "$1".spec.in
127
+ get_staged_file -o "$1".spec.in
128
test -f $MYTMP/files/"$1".spec.in || return 0 # Spec file is optional
129
sed -n -e '1,/^%changelog/d' -e '/^*/{s/.*- \([0-9].*\)/\1/p;q}' "$1".spec.in
130
}
@@ -254,10 +254,6 @@ check_versions() {
254
then
255
echo "Version in configure.ac ($confver) differs from ChangeLog ($clogver)"
256
status=1
257
- elif [ "$(git tag -l v$confver)" ]
258
- then
259
- echo "Tag v$confver already exists"
260
- status=1
257
fi
258
259
if [ "$specver" ]
@@ -270,24 +266,33 @@ check_versions() {
266
fi
267
fi
268
273
- if [ "$(git config user.signingkey)" = "" ]
269
+ if [ ! "$TRAVIS_TAG" ]
270
then
275
- echo "You need to set up a PGP signing key e.g.:"
276
- echo " gpg --list-keys"
277
- echo "and"
278
- echo " git config user.signingkey SHORTID"
279
- echo "or"
280
- echo " git config --global user.signingkey SHORTID"
281
- status=1
282
- fi
271
+ if [ "$(git tag -l v$confver)" ]
272
+ then
273
+ echo "Tag v$confver already exists"
274
+ status=1
275
+ fi
276
284
- git status -s | grep "^?" > $MYTMP/needclean
285
- if [ -s $MYTMP/needclean ]
286
- then
287
- echo "The following files must be dealt with before commit:"
288
- cat $MYTMP/needclean
289
- echo "e.g. add them to .gitignore or remove with 'git clean -fdx'"
290
- status=1
277
+ if [ "$(git config user.signingkey)" = "" ]
278
+ then
279
+ echo "You need to set up a PGP signing key e.g.:"
280
+ echo " gpg --list-keys"
281
+ echo "and"
282
+ echo " git config user.signingkey SHORTID"
283
+ echo "or"
284
+ echo " git config --global user.signingkey SHORTID"
285
+ status=1
286
+ fi
287
+
288
+ git status -s | grep "^?" > $MYTMP/needclean
289
+ if [ -s $MYTMP/needclean ]
290
+ then
291
+ echo "The following files must be dealt with before commit:"
292
+ cat $MYTMP/needclean
293
+ echo "e.g. add them to .gitignore or remove with 'git clean -fdx'"
294
+ status=1
295
+ fi
296
fi
297
fi
298