From 0080a1f37300ab3f3c6dc8a63edd32f6fe310a81 Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@openam.org.ru>
Date: Fri, 23 Feb 2018 11:30:57 +0000
Subject: [PATCH] fix maven release tagging
---
.travis.yml | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 5f218ac..d07981d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,16 +4,20 @@
- os: linux
jdk: openjdk8
before_deploy:
- - git config --local user.name "OpenIdentityPlatform Community"
- - git config --local user.email "open-identity-platform-opendj@googlegroups.com"
+ - git config --local user.name "Open Identity Platform Community" && git config --local user.email "open-identity-platform-opendj@googlegroups.com"
- git checkout -f $TRAVIS_BRANCH
- - mvn -DreleaseVersion="$git_version" -DignoreSnapshots=true -DpushChanges=false --batch-mode release:prepare
+ - git tag -f $git_version && git tag -d $git_version
+ - mvn -q -B -DreleaseVersion="$git_version" -DignoreSnapshots=true -DpushChanges=false -DscmCommentPrefix="[ci skip] " -DskipTests -Darguments=-DskipTests release:prepare
+ - git push --quiet --force https://$GITHUBKEY@github.com/$TRAVIS_REPO_SLUG.git >/dev/null 2>&1
+ - git push --quiet --force https://$GITHUBKEY@github.com/$TRAVIS_REPO_SLUG.git $git_version >/dev/null 2>&1
deploy:
provider: releases
draft: false
prerelease: false
+ target_commitish: $(git rev-list -n 1 $git_version)
+ tag_name: $git_version
name: $git_version
- body: "compare: $(git rev-list -n 1 $git_version_last)...$TRAVIS_COMMIT"
+ body: "compare: $(git rev-list -n 1 $git_version_last)...$(git rev-list -n 1 $git_version)"
api_key:
secure: PgK6BoNCzi1doFlci8nSFRkGe45wLszpN5ItmqVtkR7Hp2oUN7xNRfin2bAR5J3iAZbdcjl9JopRrlsZ3LQYtxuYH4TZVGMxIWMptNW96xizc3JbJVV+4U2MAGBvdEKoePg1GKwOVCcd6uj1+8JT3lhG9fBLA4rh3ExKRYaSyHg8U095OyhHUM9gtlAYwkgCF40vwG+qcOnhfgf+kqDCsOx0LW6NmZzgw7+7thmjM/92ERg65QnBtk5cSwcbqKcuZxdS9huBeFg2JMfISdFgr8Ps1QrDDm4E6HGctXwf9FudZC2qFTcKtL7dBg1DpAFGAkRQwPlwmTgmGeFTP2lBPAMwldxRexLwC7886kBDK533AedjMP33M3QlkpIitaTv8UwedkKi7b27+GachwsaPE4I5BpKMDw4V86qnHji4e8AXE/PDZhjn7w9SErN/09FcCb9t1J+IfwHzWVL+EqdOgbWdtQTVDFjpNjfdlMh9RJ8I0akxPu8V4fFIVfNCD/XRSe+Df6dmzhqHo6wrPTd842VHbiS4PCCuAVobAJ10zv/JGzS4XUa41o+oT2IZ+0psj8Wm19/XLmVyKm31ilB98vMqWPUuiZqlDfXIbFxYxVHL9Ubr6ThpVzQE2YPUBxQpjIbrNRUjn/r3j5kndEouhT0x+Oy4tbbato/oyDB4BQ=
skip_cleanup: true
@@ -28,24 +32,25 @@
tags: false
branch:
- master
+ - travis
after_deploy:
- echo 'after_deploy'
- - os: linux
+ - os: linuxwin
jdk: oraclejdk8
- os: osx
osx_image: xcode9.1
allow_failures:
- os: osx
branches:
- only:
- - master
+ except:
+ - /[0-9]+\.[0-9]+\.[0-9]+$/
notifications:
email:
- open-identity-platform-opendj@googlegroups.com
before_install:
- date -u
- uname -a
- - if [ $TRAVIS_OS_NAME = linux ]; then sudo apt-get install -y rpm; else brew install rpm; fi
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then sudo apt-get install -y rpm; else brew install rpm; fi
- git fetch -t
- export git_version_last="$(git describe --abbrev=0 --tags)"
- export git_version="$(echo $git_version_last | awk -F . '{ printf "%d.%d.%d", $1,$2,$3 + 1}')"
@@ -53,4 +58,4 @@
- git log `git describe --tags --abbrev=0 HEAD^`..HEAD --oneline
- mvn -q -B -DskipTests clean install -f forgerock-parent
script:
- - mvn -q -B clean install
+ - mvn -q -B clean install
\ No newline at end of file
--
Gitblit v1.10.0