Skip to content

Commit

Permalink
Merge branch 'master' into feature/SHIBUI-1317
Browse files Browse the repository at this point in the history
# Conflicts:
#	build.gradle
  • Loading branch information
jj committed Jun 11, 2019
2 parents 5f3aa4a + df3abf7 commit fa08c63
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 1 deletion.
1 change: 0 additions & 1 deletion backend/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ plugins {
id 'war'
id 'org.springframework.boot' version '2.1.5.RELEASE'
id 'com.gorylenko.gradle-git-properties' version '1.4.21'
id 'net.researchgate.release' version '2.6.0'
id 'io.franzbecker.gradle-lombok' version '1.13'
id 'com.palantir.docker' version '0.20.1'
id 'com.palantir.docker-run' version '0.20.1'
Expand Down
18 changes: 18 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
plugins {
id 'base'
id 'net.researchgate.release' version '2.6.0'
id 'com.github.breadmoirai.github-release' version '2.2.9'
}

tasks.findByName('release').dependsOn project.getTasksByName('test', true)

githubRelease {
token project.'i2.github.token'
owner project.'i2.github.owner'
repo project.'i2.github.repo'
releaseAssets project('backend').getTasksByName('bootWar', false).outputs, project('backend').getTasksByName('bootJar', false).outputs
overwrite true
apiEndpoint project.'i2.github.apiEndpoint'
}

afterReleaseBuild.dependsOn project.getTasksByName('githubRelease', false)
6 changes: 6 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,9 @@ hibernate.version=5.2.11.Final
lucene.version=7.2.1

org.gradle.jvmargs=-Xmx4g -XX:-UseGCOverheadLimit

# set token in personal global
i2.github.token=
i2.github.owner=TIER
i2.github.repo=shib-idp-ui
i2.github.apiEndpoint=https://github.internet2.edu/api/v3

0 comments on commit fa08c63

Please sign in to comment.