Skip to content

Commit

Permalink
Changed docker-publish and fineract-client-publish workflows to use d…
Browse files Browse the repository at this point in the history
…evelop-mifos branch
  • Loading branch information
galovics authored and Jenkins Automation Server committed Oct 28, 2024
1 parent 58d240c commit 26be7a7
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Publish Fineract to Docker Hub
on:
push:
branches:
- develop
- develop-mifos
workflow_dispatch:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fineract-client-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Publish Fineract client to Mifos Artifactory
on:
push:
branches:
- develop
- develop-mifos

permissions:
contents: write
Expand Down
37 changes: 14 additions & 23 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -119,22 +119,23 @@ gradle clean bootRun'''

version = '0.0.0-SNAPSHOT'

gitVersioning.apply {
refs {
considerTagsOnBranches = true
describeTagPattern = '.*(\\d+\\.\\d+\\.\\d+).*'
describeTagFirstParent = false

branch("release\\/\\d+\\.\\d+\\.\\d+") {
version = '${describe.tag.version.major}.${describe.tag.version.minor}.${describe.tag.version.patch}'
if (project.hasProperty('fineract.release.version')) {
gitVersioning.apply {
refs {
considerTagsOnBranches = true

tag("(?<version>.*)") {
version = "0.0.${project.getProperty('fineract.release.version')}-\${commit.short}"
}

branch(".+") {
version = "0.0.${project.getProperty('fineract.release.version')}-\${commit.short}"
}
}
branch("maintenance\\/\\d+\\.\\d+") {
version = '${describe.tag.version.major}.${describe.tag.version.minor}.${describe.tag.version.patch}'
rev {
version = "0.0.${project.getProperty('fineract.release.version')}-\${commit.short}"
}
}
rev {
version = '${describe.tag.version.major}.${describe.tag.version.minor.next}.${describe.tag.version.patch}-SNAPSHOT'
}
}

ext['groovy.version'] = '4.0.17'
Expand Down Expand Up @@ -725,10 +726,6 @@ configure(project.fineractCustomProjects) {
configure(project.fineractPublishProjects) {
apply plugin: 'maven-publish'

if (!project.hasProperty('noSign')) {
apply plugin: 'signing'
}

publishing {
publications {
mavenJava(MavenPublication) {
Expand Down Expand Up @@ -784,12 +781,6 @@ configure(project.fineractPublishProjects) {
}
}
}

if (!project.hasProperty('noSign')) {
signing {
sign publishing.publications.mavenJava
}
}
}

task printSourceSetInformation() {
Expand Down

0 comments on commit 26be7a7

Please sign in to comment.