Skip to content

Commit 002c5d2

Browse files
committed
Merge pull request 'Release v24.08.1' (#10) from release_24.08.1 into master
2 parents 7968210 + 1707630 commit 002c5d2

File tree

4 files changed

+14
-5
lines changed

4 files changed

+14
-5
lines changed

Jenkinsfile

+10-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ pipeline {
2727
anyOf {
2828
branch 'master'
2929
branch 'release_*'
30+
branch 'hotfix_release_*'
3031
allOf {
3132
branch 'PR-*'
3233
expression { env.CHANGE_BRANCH.startsWith("release_") }
@@ -43,6 +44,7 @@ pipeline {
4344
anyOf {
4445
branch 'master'
4546
branch 'release_*'
47+
branch 'hotfix_release_*'
4648
allOf {
4749
branch 'PR-*'
4850
expression { env.CHANGE_BRANCH.startsWith("release_") }
@@ -59,6 +61,7 @@ pipeline {
5961
anyOf {
6062
branch 'master'
6163
branch 'release_*'
64+
branch 'hotfix_release_*'
6265
branch 'sonar_*'
6366
allOf {
6467
branch 'PR-*'
@@ -83,6 +86,7 @@ pipeline {
8386
anyOf {
8487
branch 'master'
8588
branch 'develop'
89+
branch 'hotfix_release_*'
8690
}
8791
}
8892
steps {
@@ -95,7 +99,12 @@ pipeline {
9599
}
96100
}
97101
stage('tag release') {
98-
when { branch 'master' }
102+
when {
103+
anyOf {
104+
branch 'master'
105+
branch 'hotfix_release_*'
106+
}
107+
}
99108
steps {
100109
withCredentials([gitUsernamePassword(credentialsId: '93f7e7d3-8f74-4744-a785-518fc4d55314',
101110
gitToolName: 'git-tool')]) {

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ Detail | Description
1515
**Plugin identifier** | intranda_step_exportPackage
1616
**Plugin type** | step
1717
**Licence** | GPL 2.0 or newer
18-
**Documentation (German)** | https://docs.goobi.io/workflow-plugins/v/eng/step/goobi-plugin-step-export-package
19-
**Documentation (English)** | https://docs.goobi.io/workflow-plugins/v/ger/step/goobi-plugin-step-export-package
18+
**Documentation (German)** | https://docs.goobi.io/workflow-plugins/v/ger/step/goobi-plugin-step-export-package
19+
**Documentation (English)** | https://docs.goobi.io/workflow-plugins/v/eng/step/goobi-plugin-step-export-package
2020

2121
## Goobi details
2222

module-base/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>io.goobi.workflow.plugin</groupId>
55
<artifactId>plugin-step-export-package</artifactId>
6-
<version>24.07</version>
6+
<version>24.08.1</version>
77
</parent>
88
<artifactId>plugin-step-export-package-base</artifactId>
99
<packaging>jar</packaging>

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>io.goobi.workflow</groupId>
55
<artifactId>workflow-base</artifactId>
6-
<version>24.07</version>
6+
<version>24.08.1</version>
77
<relativePath />
88
</parent>
99
<groupId>io.goobi.workflow.plugin</groupId>

0 commit comments

Comments
 (0)