diff options
| author | jgeboski <jgeboski@gmail.com> | 2015-12-22 08:15:58 +0300 |
|---|---|---|
| committer | jgeboski <jgeboski@gmail.com> | 2015-12-22 08:15:58 +0300 |
| commit | 10bf73d8623337837f0e5b6b4019c989bdfdebed (patch) | |
| tree | c969155ac26ed3082be43e03cebcd373f00dabfd | |
| parent | 8e29e4122c970337941f03a031bdf18e298d697e (diff) | |
travis: fixed version numbers
| -rwxr-xr-x | .travis/obs.sh | 3 | ||||
| -rwxr-xr-x | .travis/win32-build.sh | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/.travis/obs.sh b/.travis/obs.sh index 0ffbe11..3be396c 100755 --- a/.travis/obs.sh +++ b/.travis/obs.sh @@ -5,7 +5,8 @@ ] || exit set -e -FULLVERS="$(date +%Y%m%d)~$(git rev-parse --short=7 HEAD)~${TRAVIS_BUILD_NUMBER}" +GITREV=$(git rev-parse --short=7 HEAD) +FULLVERS="$(date +%Y%m%d)~${GITREV}~$(cat VERSION)~${TRAVIS_BUILD_NUMBER}" FULLDATE=$(date -R) REPONAME=$(basename "${TRAVIS_REPO_SLUG}") diff --git a/.travis/win32-build.sh b/.travis/win32-build.sh index db27077..c058f0c 100755 --- a/.travis/win32-build.sh +++ b/.travis/win32-build.sh @@ -1,10 +1,13 @@ #!/bin/bash set -e +GITREV=$(git rev-parse --short=7 HEAD) +FULLVERS="$(date +%Y%m%d)~${GITREV}~$(cat VERSION)~${TRAVIS_BUILD_NUMBER}" + CC="i686-w64-mingw32-gcc" \ DLL_LD_FLAGS="-static-libgcc" \ make -f Makefile.mingw \ install \ GLIB_GENMARSHAL="glib-genmarshal" \ - PLUGIN_VERSION="${VERSION}" \ + PLUGIN_VERSION="${FULLVERS}" \ WIN32_TREE_TOP="win32-dev/pidgin-2.10.11" |