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

Commit c78ade6

Browse files
committed
Adjustments for maintenance branch
1 parent f0904fc commit c78ade6

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
stage: deploy
4545
jdk: oraclejdk8
4646
env: JOB=sonatype
47-
if: branch = master AND type = push
47+
if: branch = trellis-ext-aws-0.1.x AND type = push
4848
# Only automate the publication of SNAPSHOTS
4949
script: if [[ $(./gradlew -q getVersion) == *SNAPSHOT* ]]; then ./gradlew publish ; fi
5050

@@ -53,8 +53,7 @@ jobs:
5353
stage: deploy
5454
jdk: oraclejdk8
5555
env: JOB=docker
56-
# TODO add support for maintenance branches
57-
if: branch = master AND type = push
56+
if: branch = trellis-ext-aws-0.1.x AND type = push
5857
before_script: echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
5958
script: if [[ $(./gradlew -q getVersion) == *SNAPSHOT* ]]; then ./gradlew dockerPush dockerPushDevelop; else ./gradlew dockerPush dockerPushLatest; fi
6059

@@ -63,7 +62,7 @@ jobs:
6362
stage: deploy
6463
jdk: oraclejdk8
6564
env: JOB=aws
66-
if: branch = master AND type = push
65+
if: branch = trellis-ext-aws-0.1.x AND type = push
6766
script: ./gradlew apidocs
6867
deploy:
6968
provider: s3

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ allprojects { subproj ->
9696
tagTemplate = '$name-$version'
9797
git {
9898
/* Note: adjust this value for maintenance branches. */
99-
requireBranch = 'master'
99+
requireBranch = 'trellis-ext-aws-0.1.x'
100100
signTag = true
101101
}
102102
}

0 commit comments

Comments
 (0)