Skip to content

Commit d8b5c61

Browse files
committed
Updated build settings for Travis
1 parent d0f014b commit d8b5c61

File tree

3 files changed

+3
-27
lines changed

3 files changed

+3
-27
lines changed

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ bintray {
167167
userOrg = 'graphql-java-kickstart'
168168
version {
169169
name = project.version
170+
vcsTag = 'v${version}'
170171
}
171172
}
172173
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version = 6.1.4
1+
version = 6.1.4-SNAPSHOT
22
group = com.graphql-java-kickstart

travis-build.sh

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,7 @@
11
#!/bin/bash
22
set -ev
3-
echo "current git hash:"
4-
git rev-parse --short HEAD
5-
6-
saveMavenSettings() {
7-
cat >$HOME/.m2/settings.xml <<EOL
8-
<?xml version='1.0' encoding='UTF-8'?>
9-
<settings xsi:schemaLocation='http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd'
10-
xmlns='http://maven.apache.org/SETTINGS/1.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
11-
<servers>
12-
<server>
13-
<id>bintray</id>
14-
<username>${BINTRAY_USER}</username>
15-
<password>${BINTRAY_PASS}</password>
16-
</server>
17-
<server>
18-
<id>github</id>
19-
<username>${GITHUB_USER}</username>
20-
<password>${GITHUB_TOKEN}</password>
21-
</server>
22-
</servers>
23-
</settings>
24-
EOL
25-
}
263

274
if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ] && [ "${RELEASE}" = "true" ]; then
285
echo "Deploying release to Bintray"
29-
saveMavenSettings
30-
git checkout -f ${TRAVIS_BRANCH}
31-
./gradlew clean assemble && ./gradlew check --info && ./gradlew bintrayUpload -x check --info
6+
./gradlew clean assemble release -Prelease.useAutomaticVersion=true && ./gradlew check --info && ./gradlew bintrayUpload -x check --info
327
fi

0 commit comments

Comments
 (0)