Skip to content

Commit 6e56bd9

Browse files
galovicsJenkins Automation Server
authored and
Jenkins Automation Server
committed
Changed docker-publish and fineract-client-publish workflows to use develop-mifos branch
1 parent ff23006 commit 6e56bd9

File tree

3 files changed

+16
-25
lines changed

3 files changed

+16
-25
lines changed

.github/workflows/docker-publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Publish Fineract to Docker Hub
33
on:
44
push:
55
branches:
6-
- develop
6+
- develop-mifos
77
workflow_dispatch:
88

99
jobs:

.github/workflows/fineract-client-publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Publish Fineract client to Mifos Artifactory
33
on:
44
push:
55
branches:
6-
- develop
6+
- develop-mifos
77

88
permissions:
99
contents: write

build.gradle

+14-23
Original file line numberDiff line numberDiff line change
@@ -122,22 +122,23 @@ gradle clean bootRun'''
122122

123123
version = '0.0.0-SNAPSHOT'
124124

125-
gitVersioning.apply {
126-
refs {
127-
considerTagsOnBranches = true
128-
describeTagPattern = '.*(\\d+\\.\\d+\\.\\d+).*'
129-
describeTagFirstParent = false
130-
131-
branch("release\\/\\d+\\.\\d+\\.\\d+") {
132-
version = '${describe.tag.version.major}.${describe.tag.version.minor}.${describe.tag.version.patch}'
125+
if (project.hasProperty('fineract.release.version')) {
126+
gitVersioning.apply {
127+
refs {
128+
considerTagsOnBranches = true
129+
130+
tag("(?<version>.*)") {
131+
version = "0.0.${project.getProperty('fineract.release.version')}-\${commit.short}"
132+
}
133+
134+
branch(".+") {
135+
version = "0.0.${project.getProperty('fineract.release.version')}-\${commit.short}"
136+
}
133137
}
134-
branch("maintenance\\/\\d+\\.\\d+") {
135-
version = '${describe.tag.version.major}.${describe.tag.version.minor}.${describe.tag.version.patch}'
138+
rev {
139+
version = "0.0.${project.getProperty('fineract.release.version')}-\${commit.short}"
136140
}
137141
}
138-
rev {
139-
version = '${describe.tag.version.major}.${describe.tag.version.minor.next}.${describe.tag.version.patch}-SNAPSHOT'
140-
}
141142
}
142143

143144
ext['groovy.version'] = '4.0.17'
@@ -808,10 +809,6 @@ configure(project.fineractCustomProjects) {
808809
configure(project.fineractPublishProjects) {
809810
apply plugin: 'maven-publish'
810811

811-
if (!project.hasProperty('noSign')) {
812-
apply plugin: 'signing'
813-
}
814-
815812
publishing {
816813
publications {
817814
mavenJava(MavenPublication) {
@@ -867,12 +864,6 @@ configure(project.fineractPublishProjects) {
867864
}
868865
}
869866
}
870-
871-
if (!project.hasProperty('noSign')) {
872-
signing {
873-
sign publishing.publications.mavenJava
874-
}
875-
}
876867
}
877868

878869
task printSourceSetInformation() {

0 commit comments

Comments
 (0)