Skip to content

Commit f668a18

Browse files
galovicsJenkins Automation Server
authored andcommitted
Changed docker-publish and fineract-client-publish workflows to use develop-mifos branch
1 parent 8f37507 commit f668a18

File tree

4 files changed

+18
-27
lines changed

4 files changed

+18
-27
lines changed

.github/workflows/docker-publish.yml

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ name: Publish Fineract client to Mifos Artifactory
33
on:
44
push:
55
branches:
6-
- develop
6+
- develop-mifos
77

88
permissions:
99
contents: write
1010

1111
jobs:
1212
build:
13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-24.04
1414
env:
1515
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
1616
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}

.github/workflows/sync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
jobs:
1111
build:
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-24.04
1313

1414
steps:
1515
- name: Checkout

build.gradle

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -127,22 +127,23 @@ gradle clean bootRun'''
127127

128128
version = '0.0.0-SNAPSHOT'
129129

130-
gitVersioning.apply {
131-
refs {
132-
considerTagsOnBranches = true
133-
describeTagPattern = '.*(\\d+\\.\\d+\\.\\d+).*'
134-
describeTagFirstParent = false
135-
136-
branch("release\\/\\d+\\.\\d+\\.\\d+") {
137-
version = '${describe.tag.version.major}.${describe.tag.version.minor}.${describe.tag.version.patch}'
130+
if (project.hasProperty('fineract.release.version')) {
131+
gitVersioning.apply {
132+
refs {
133+
considerTagsOnBranches = true
134+
135+
tag("(?<version>.*)") {
136+
version = "0.0.${project.getProperty('fineract.release.version')}-\${commit.short}"
137+
}
138+
139+
branch(".+") {
140+
version = "0.0.${project.getProperty('fineract.release.version')}-\${commit.short}"
141+
}
138142
}
139-
branch("maintenance\\/\\d+\\.\\d+") {
140-
version = '${describe.tag.version.major}.${describe.tag.version.minor}.${describe.tag.version.patch}'
143+
rev {
144+
version = "0.0.${project.getProperty('fineract.release.version')}-\${commit.short}"
141145
}
142146
}
143-
rev {
144-
version = '${describe.tag.version.major}.${describe.tag.version.minor.next}.${describe.tag.version.patch}-SNAPSHOT'
145-
}
146147
}
147148

148149
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)