Merge branch 'pipeline' into 'master'
Use the makechangelog.uxf from the builder See merge request uxf/vnc-avatar!3
This commit is contained in:
+1
-1
@@ -19,7 +19,7 @@ build-and-push-deb-package:
|
||||
script:
|
||||
- yarn install
|
||||
- git fetch --tags
|
||||
- ./debian/makechangelog.uxf > debian/changelog && cat debian/changelog
|
||||
- makechangelog.uxf > debian/changelog && cat debian/changelog
|
||||
- cat debian/changelog
|
||||
- mkdir src
|
||||
- sed -n 1p debian/changelog | grep -oP '\(.*?\)' > src/version.txt
|
||||
|
||||
Vendored
-29
@@ -1,29 +0,0 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
|
||||
# if [ -n "$VERSION" ]; then
|
||||
VERSION=`git tag | egrep -v "[a-zA-Z]" |tail -n 1`
|
||||
VERSION=`git log --decorate=full | grep "tag: refs/tags" | awk -F "tag: refs/tags/" '{print $2}' | awk -F ")" '{print $1}' | awk -F "," '{print $1}' | egrep -v "[a-zA-Z]" | head -1`
|
||||
#git log --format="%d %h %cn /;/ %s" | grep -m 1 "^ (tag" | awk -F "tag: " '{print $2}' | awk -F ")" '{print $1}'`
|
||||
#fi
|
||||
|
||||
if [ -n "$BUILD_NUMBER" ]; then
|
||||
BUILD=$BUILD_NUMBER
|
||||
else
|
||||
BUILD=`git log --format="%d %h %cn /;/ %s" | grep -B 30000 "tag: $VERSION" | grep -v "tag: $VERSION" | wc -l`
|
||||
fi
|
||||
HASH=`git log --format="%h" -1`
|
||||
BRANCH=` echo "$GIT_BRANCH" | sed 's/origin\///' | sed 's/* //' | sed 's/\//-/g'`
|
||||
PKGNAME=`cat debian/control | grep -m 1 "^Package" | awk -F "Package: " '{print $2}'`
|
||||
DCNAME=`lsb_release -a | grep "Codename" | awk '{print $2}'`
|
||||
|
||||
echo "$PKGNAME ($VERSION-$DCNAME-$BUILD-$HASH) $DCNAME; urgency=low"
|
||||
#> debian/changelog
|
||||
echo " "
|
||||
#>>
|
||||
#/debian/changelog
|
||||
|
||||
|
||||
echo " * build by factoryjenkins"
|
||||
echo " "
|
||||
git log -1 --format=" %aD /;/ %cn <%ce>" | awk -F " /;/ " '{print " -- " $2 " " $1}'
|
||||
Reference in New Issue
Block a user