Skip to content
This repository was archived by the owner on May 4, 2019. It is now read-only.

Commit 425c2fd

Browse files
gregwhitakergregwhitaker
committed
cipipeline
1 parent 65dc75a commit 425c2fd

File tree

8 files changed

+141
-104
lines changed

8 files changed

+141
-104
lines changed

‎.travis.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ matrix:
77
before_install:
88
- wget https://github.com/google/protobuf/releases/download/v3.6.0/protobuf-cpp-3.6.0.tar.gz
99
- tar -xzvf protobuf-cpp-3.6.0.tar.gz
10-
- pushd protobuf-3.6.0 && ./configure --disable-shared && make && sudo make install && popd
10+
- pushd protobuf-3.6.0 && ./configure --disable-shared && make && sudo make install
11+
&& popd
1112
script: gradle/buildViaTravis-linux.sh
1213
- os: osx
1314
osx_image: xcode9.4
@@ -17,10 +18,10 @@ matrix:
1718
- LDFLAGS="/usr/local/lib/libprotobuf.a /usr/local/lib/libprotoc.a"
1819
before_install:
1920
- brew update
20-
- EDITOR="sed -i '' 's/system \".\/configure\",/system \".\/configure\", \"--disable-shared\",/g'" brew edit protobuf
21+
- EDITOR="sed -i '' 's/system \".\/configure\",/system \".\/configure\", \"--disable-shared\",/g'"
22+
brew edit protobuf
2123
- brew install protobuf
2224
script: gradle/buildViaTravis.sh
23-
2425
before_cache:
2526
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
2627
notifications:
@@ -30,8 +31,9 @@ cache:
3031
- "$HOME/.gradle/caches/"
3132
- "$HOME/.gradle/wrapper/"
3233
- "$HOME/.m2"
33-
3434
env:
3535
global:
3636
- secure: fG6x4/LuQuYDO6B3hw9YnxTKBepOS/zcSqDbyl3fJkYSDYuRS6yvI0CsQCQGTLtD3MKED+0o43rUiuPgNzz3qENKQukrFgmXQl24fwuUxtFhz4Lbb3OCMnWMAU3SgWZmpbUoOhCEGr0LzvYnb+MImiRU2v7gxr4Nc9hy8gRZjQQ4R7V+UlhOhZVjN5JfsEnKMpZejEkFlNADCdAhSDdHLVZN7lOsFjDC7XQ/GKLKGrRyIzREto9hm58QIsolghMyIEL2Jj1+ePTM/3wCYLUaRpdUjmHQawJi9vfwFO4g4yyKdUVXHpITQwQ7JE/SoJsje8ZUhOJZ3TvaBDlVjvXP41P3JNDbSesrBYcR0k70TYr7wliHKsdGurHvDQ/2Rxas/FITFGvLchYczbUPLJ7h0fJha+cpwsmmNvLmg0RIaaHa4RXPknWuetipbJFSqYtBN01iCtdSzHwwhZGZ6zV3kPBa0QWsDLWa/Ih2STDY6DVIA6YgaqaM6aN9U/UR8XeCnjPot+StaNuU2nSgGcwX5BIZRMuca9OF6FryG+t527njU86mp2QSj1HOTs/c31v9sSg2krCl7jChm3ZtpXyiEp+IdKaa5uZHLyx0fcm489375PLjhE6gRp/zvYf58uSvoMLOl1xwfOkNiPP8YXIDtVodzgGxCnxD49WE5B9CCbk=
3737
- secure: NvHtXfxiqBwkmj5l7Wr9EuBi9X0dMVL5CCeKFVqzIOmXCIdjwvknQ3rfZZ46fjwOQC/FuCcoM/8dHkBIkGzqIVo9Qx1+AGnq4AO7rr+iLYPvmz2wB8QKrD81bVAhtoKnuYe1wyu1XvURBgrietjoAgxrhgW3iReBVW4dj0YaTdRZXAD70M3i63tfV9GyB2pv6NfRyaq50IGkaJPdiyUPpDWcSmtnrkxQvUvIzNm50AGKEq3IuLp+wgVouAI81m1a+B0TuEfo4VnqOKlJx1dq9VT76GN4Ni+u2Rnnli2kFAXGtGfuPrZF1WPE2APJQ4W9H7YeGzya38JCUkkwD2Buxoe7CsW7ZEVnGbFE4xsuc+vejvDkeGF4LLABzuGwcDxG70MPHoXpyd1ayY3Iek1zPn4/3nFTO40YreeaHDT3MG3BSZx6WkMfmqfnFsKJeX9g7zzZLGmOuniwGLOIwFpePtyhn/wQvfPG+UalnSk+pXyGWuhnurcgDlk7ASlHj4TZnDiZvCCZy1xdzytttwf/i71Ts+6Db+TZfggnymeYFRo19UpLTr15Rdkwk0CNrJlvruKkGkR5G2els14M37PhHaeIdGol3ZqARs9+7o9gnRW2cPaQ26IRgNSGQwRhGaJcAyoLNZejc97OHEga9r6B8cIJK6NGD+4m8GA7Sh4O3EM=
38+
- secure: crwXv5Q/iCtIIC81QWgWYNfuGJxSQQjVn83vvRoRMXmfSZ02NnQfDos+p1GxxbIXLUQ8NsaLc8cg0o2PQgsK/l0d7nDExix5Rt+AwzU4UOrUcZh46MgEeZDow4q6ySToOHaeKsaRnbTIpAwU28o9fnZ9ViaQ7s2uZWQZXYigGf0PN1ca9E8MJ6VEMvp34e2wJok6woaWG9ALCL2b5viofTv0zdHXWfGV4rdz9Rq0fThmFn4BlmHdcTwGt2ZLdWcEbzv0qNYNAiVvNJd4uWHOnjRceslAZ/JZxgIzSHK0ctNiZdc9rRNo8BHGQqKvmZqmbzUAU07uS0+iLBnm89KKJyQCXKulDv7NM0ShiFexMQ17TUOdlJtH65ypzUIJ+sbSOj2M+NhThUD8OQlebvjKF6t8M9f1NIXkkH/Xw2XJ146ANBcGyjALVFDIqlKIyCtIoY3/teQWccfbAzBglC24QBizpfgmdBEGOJXs2qR0NxzcIRNc1o9XPyT9BJxa+9JnHyHbF+LG07j1LfaaJSQBIYL7xjDBwEEIOEmP3UrISwjvs1fOQA3oYINguXtl7qi3wNylv35e5xw5acijcTTYHRSY6A5rPdokbK0fCQHCrHldBYDc8Bvy+GnjnYQHynjdWGbTnkvMgvYe2aHD+mH5pO5V7DRYHhnJsuMuscRIELc=
39+
- secure: ZMu9rhzTT1F6pyqqrd0TGhAeUGigAvGZT5rJv2ifZJEB8+FOQ+/ylJ/Q3Gq9Wx8quWVR/ocTWF8yEuA1BlZF1Z+tfOcCXOaYPrgMFNhgmETK9X1AQN1gahkTzLNWEZUzKwte5IwaDYDwMe54VcJpY9/f7R6ZyjKVEJOLCjnJ+YLR2rjttsug9ZurH3iLzdgRGMHyI55+dz83MkdumkkATFAeLnQepdL2n4ijD0NvuzvlvaU+Knz9AZCX2kSNDM+hn+K0fFDM4CBFduBi8gEYmRlnSXslHtfwuZRViZQaS4voRMAFmWPNCH67ya3f1voi41BWXgaGTW5He8XDjQtFcIphvykmMOsS4ka9u4K0LEbReoSBRwBUAhigGMFXB1lMup66+WvjvSvwS9rMVVGaXpVGjgpM5shWpiIEoWICWU+Pu5ihk9BWv61/tYNNw6u3QlXt1ZfjM50F7eoJ1ctfYqClrlD3iwrBJ47aIu4kH1HdCp9uxkxq+Cz75n2UdV6Py7eEW1N141fnZ/Iax8nzbNu4SxccsJn1yUv22LJCteW3//GqvRVa7hets587PFpfkyaraBLNBvh90/wouXK/yvYBZN4WK7VwnuCUmxTjTglT9mQGUgPOYNMDU/m7rDp2zDc+8aMEfQjWGktH93M0g1l9yhidc8AMQbyAaxkk73M=

‎build.gradle‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'com.gradle.build-scan' version '1.9' // declare before any other plugin
2+
id 'com.gradle.build-scan' version '1.15.1' // declare before any other plugin
33
id 'com.jfrog.bintray' version '1.8.0'
44
id 'com.google.osdetector' version '1.4.0'
55
id 'com.github.sherter.google-java-format' version '0.6' apply false
@@ -14,104 +14,91 @@ project(':auth') {
1414
description = 'Netifi Proteus Authentication Utilities'
1515
ext.artifactName = 'auth'
1616

17-
apply from: file('../gradle/release.gradle')
1817
apply from: file('../gradle/java.gradle')
1918
}
2019

2120
project(':access-key-info-idl') {
2221
description = 'Netifi Access Key IDL'
2322
ext.artifactName = 'access-key-idl'
2423

25-
apply from: file('../gradle/release.gradle')
2624
apply from: file('../gradle/java.gradle')
2725
}
2826

2927
project(':broker-info-idl') {
3028
description = 'Netifi Broker Info IDL'
3129
ext.artifactName = 'broker-info-idl'
3230

33-
apply from: file('../gradle/release.gradle')
3431
apply from: file('../gradle/java.gradle')
3532
}
3633

3734
project(':broker-mgmt-idl') {
38-
3935
description = 'Netifi Broker Management IDL'
4036
ext.artifactName = 'broker-mgmt-idl'
4137

42-
apply from: file('../gradle/release.gradle')
4338
apply from: file('../gradle/java.gradle')
4439
}
4540

4641
project(':client') {
4742
description = 'Netifi Proteus Client'
4843
ext.artifactName = 'client'
4944

50-
apply from: file('../gradle/release.gradle')
5145
apply from: file('../gradle/java.gradle')
5246
}
5347

5448
project(':core') {
5549
description = 'Netifi Core Library'
5650
ext.artifactName = 'core'
5751

58-
apply from: file('../gradle/release.gradle')
5952
apply from: file('../gradle/java.gradle')
6053
}
6154

6255
project(':core-idl') {
6356
description = 'Netifi Core IDL'
6457
ext.artifactName = 'core-idl'
6558

66-
apply from: file('../gradle/release.gradle')
6759
apply from: file('../gradle/java.gradle')
6860
}
6961

7062
project(':frames') {
7163
description = 'Netifi Proteus Frames'
7264
ext.artifactName = 'frames'
7365

74-
apply from: file('../gradle/release.gradle')
7566
apply from: file('../gradle/java.gradle')
7667
}
7768

7869
project(':metrics-idl') {
7970
description = 'Netifi Proteus Metrics IDL'
8071
ext.artifactName = 'metrics-idl'
8172

82-
apply from: file('../gradle/release.gradle')
8373
apply from: file('../gradle/java.gradle')
8474
}
8575

8676
project(':metrics-micrometer') {
8777
description = 'Netifi Proteus Micrometer Support'
8878
ext.artifactName = 'metrics-micrometer'
8979

90-
apply from: file('../gradle/release.gradle')
9180
apply from: file('../gradle/java.gradle')
9281
}
9382

9483
project(':metrics-prometheus') {
9584
description = 'Netifi Proteus Prometheus Integration'
9685
ext.artifactName = 'metrics-prometheus'
9786

98-
apply from: file('../gradle/release.gradle')
9987
apply from: file('../gradle/java.gradle')
10088
}
10189

10290
project(':protobuf-rpc') {
10391
description = 'Netifi Proteus RPC'
10492
ext.artifactName = 'protobuf-rpc'
10593

106-
apply from: file('../gradle/release.gradle')
94+
apply from: file('../gradle/java.gradle')
10795
}
10896

10997

11098
project(':tracing-openzipkin') {
11199
description = 'Netifi Proteus Openzipkin Integration'
112100
ext.artifactName = 'tracing'
113101

114-
apply from: file('../gradle/release.gradle')
115102
apply from: file('../gradle/java.gradle')
116103
}
117104

@@ -120,6 +107,5 @@ project(':tracing-idl') {
120107
description = 'Netifi Proteus Tracing IDL'
121108
ext.artifactName = 'tracing-idl'
122109

123-
apply from: file('../gradle/release.gradle')
124110
apply from: file('../gradle/java.gradle')
125111
}

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
group=io.netifi.proteus
2-
version=0.8.7
2+
version=0.8.8

‎gradle/buildViaTravis-linux.sh‎

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,33 @@
11
#!/bin/bash
22
# This script will build the project.
33

4+
echo -e "TRAVIS_BRANCH=$TRAVIS_BRANCH"
5+
echo -e "TRAVIS_TAG=$TRAVIS_TAG"
6+
echo -e "TRAVIS_COMMIT=${TRAVIS_COMMIT::7}"
7+
echo -e "TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST"
8+
49
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
5-
echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"
6-
./gradlew clean build
7-
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then
8-
echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'
9-
./gradlew clean build
10-
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
11-
echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG']'
12-
./gradlew -PreleaseType=release -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" clean build :protobuf-rpc:bintrayUpload --stacktrace
10+
# Pull Request
11+
echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"
12+
./gradlew clean build --stacktrace
13+
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "develop" ] && [ "$TRAVIS_TAG" == "" ]; then
14+
# Develop Branch
15+
echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'
16+
export ORG_GRADLE_PROJECT_releaseType=snapshot
17+
export ORG_GRADLE_PROJECT_commitHash=${TRAVIS_COMMIT::7}
18+
./gradlew clean build publish --stacktrace
19+
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [[ "$TRAVIS_BRANCH" == release/* ]] && [ "$TRAVIS_TAG" == "" ]; then
20+
# Release Branch
21+
echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH']'
22+
export ORG_GRADLE_PROJECT_releaseType=releaseCandidate
23+
./gradlew clean build publish --stacktrace
24+
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
25+
# Master Branch
26+
echo -e 'Build Master for Release => Branch ['$TRAVIS_BRANCH']'
27+
export ORG_GRADLE_PROJECT_releaseType=release
28+
./gradlew clean build publish --stacktrace
1329
else
14-
echo -e 'WARN: Should not be here => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG'] Pull Request ['$TRAVIS_PULL_REQUEST']'
15-
./gradlew clean build
30+
# Feature Branch
31+
echo -e 'Build Branch => Branch ['$TRAVIS_BRANCH']'
32+
./gradlew clean build --stacktrace
1633
fi

‎gradle/buildViaTravis.sh‎

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,33 @@
11
#!/bin/bash
22
# This script will build the project.
33

4+
echo -e "TRAVIS_BRANCH=$TRAVIS_BRANCH"
5+
echo -e "TRAVIS_TAG=$TRAVIS_TAG"
6+
echo -e "TRAVIS_COMMIT=${TRAVIS_COMMIT::7}"
7+
echo -e "TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST"
8+
49
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
5-
echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"
6-
./gradlew clean build
7-
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then
8-
echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'
9-
./gradlew clean build
10-
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
11-
echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG']'
12-
./gradlew -PreleaseType=release -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" clean build bintrayUpload --stacktrace
10+
# Pull Request
11+
echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"
12+
./gradlew clean build --stacktrace
13+
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "develop" ] && [ "$TRAVIS_TAG" == "" ]; then
14+
# Develop Branch
15+
echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'
16+
export ORG_GRADLE_PROJECT_releaseType=snapshot
17+
export ORG_GRADLE_PROJECT_commitHash=${TRAVIS_COMMIT::7}
18+
./gradlew clean build publish --stacktrace
19+
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [[ "$TRAVIS_BRANCH" == release/* ]] && [ "$TRAVIS_TAG" == "" ]; then
20+
# Release Branch
21+
echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH']'
22+
export ORG_GRADLE_PROJECT_releaseType=releaseCandidate
23+
./gradlew clean build publish --stacktrace
24+
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
25+
# Master Branch
26+
echo -e 'Build Master for Release => Branch ['$TRAVIS_BRANCH']'
27+
export ORG_GRADLE_PROJECT_releaseType=release
28+
./gradlew clean build publish --stacktrace
1329
else
14-
echo -e 'WARN: Should not be here => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG'] Pull Request ['$TRAVIS_PULL_REQUEST']'
15-
./gradlew clean build
30+
# Feature Branch
31+
echo -e 'Build Branch => Branch ['$TRAVIS_BRANCH']'
32+
./gradlew clean build --stacktrace
1633
fi

‎gradle/java.gradle‎

Lines changed: 77 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,38 @@
11
apply plugin: 'java'
22
apply plugin: 'idea'
33
apply plugin: 'com.github.sherter.google-java-format'
4+
apply plugin: 'maven'
5+
apply plugin: 'maven-publish'
6+
apply plugin: 'com.jfrog.bintray'
7+
8+
task ciVersion {
9+
description = "Creates a continuous-delivery friendly version number for the service"
10+
11+
def releaseType = project.hasProperty('releaseType') ? project.property('releaseType') : System.getenv('RELEASE_TYPE')
12+
def commitHash = project.hasProperty('commitHash') ? project.property('commitHash') : System.getenv('COMMIT_HASH')
13+
14+
if (releaseType == 'release' || releaseType == 'r') {
15+
project.version = project.version
16+
} else if (releaseType == 'releaseCandidate' || releaseType == 'rc') {
17+
project.version = "${project.version}-RC"
18+
} else if (releaseType == 'snapshot' || releaseType == 's') {
19+
if (commitHash) {
20+
project.version = "${project.version}-SNAPSHOT-${commitHash}"
21+
} else {
22+
project.version = "${project.version}-SNAPSHOT"
23+
}
24+
} else {
25+
logger.info("Property 'releaseType' was not specified. Defaulting to 'snapshot'")
26+
if (commitHash) {
27+
project.version = "${project.version}-SNAPSHOT-${commitHash}"
28+
} else {
29+
project.version = "${project.version}-SNAPSHOT"
30+
}
31+
}
32+
33+
println "Setting CI Version for '${project.name}': ${version}"
34+
}
35+
build.dependsOn ciVersion
436

537
repositories {
638
jcenter()
@@ -42,18 +74,6 @@ jar {
4274
version = "${project.version}"
4375
}
4476

45-
publishing {
46-
publications {
47-
maven(MavenPublication) {
48-
from components.java
49-
50-
artifactId "${artifactName}"
51-
artifact sourcesJar
52-
artifact javadocJar
53-
}
54-
}
55-
}
56-
5777
dependencies {
5878
compileOnly 'javax.inject:javax.inject:1'
5979

@@ -75,4 +95,49 @@ test {
7595
testLogging {
7696
exceptionFormat = 'full'
7797
}
98+
}
99+
100+
if ("$version".contains('SNAPSHOT')) {
101+
publishing {
102+
publications {
103+
mavenJava(MavenPublication) {
104+
artifact sourcesJar
105+
artifact javadocJar
106+
}
107+
}
108+
repositories {
109+
maven {
110+
url = version.contains('SNAPSHOT') ? 'https://artifactory.netifiinc.com/artifactory/libs-snapshot-local' : 'https://artifactory.netifiinc.com/artifactory/libs-release-local'
111+
credentials {
112+
username = project.hasProperty('netifiArtifactoryUsername') ? project.property('netifiArtifactoryUsername') : System.getenv('NETIFI_ARTIFACTORY_USERNAME')
113+
password = project.hasProperty('netifiArtifactoryPassword') ? project.property('netifiArtifactoryPassword') : System.getenv('NETIFI_ARTIFACTORY_PASSWORD')
114+
}
115+
}
116+
}
117+
}
118+
} else {
119+
bintray {
120+
user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
121+
key = project.hasProperty('bintrayKey') ? project.property('bintrayKey') : System.getenv('BINTRAY_KEY')
122+
publications = ['maven']
123+
124+
publish = (osdetector.os == 'osx')
125+
126+
pkg {
127+
repo = 'netifi-oss'
128+
name = "${artifactName}"
129+
userOrg = 'netifi'
130+
desc = "${project.description}"
131+
websiteUrl = 'https://github.com/netifi-proteus/proteus-java'
132+
issueTrackerUrl = 'https://github.com/netifi-proteus/proteus-java/issues'
133+
vcsUrl = 'https://github.com/netifi-proteus/proteus-java.git'
134+
licenses = ['Apache-2.0']
135+
githubRepo = 'netifi-proteus/proteus-java'
136+
githubReleaseNotesFile = 'CHANGELOG.md'
137+
138+
version {
139+
name = "${version}"
140+
}
141+
}
142+
}
78143
}

0 commit comments

Comments
 (0)