Compare commits
1 Commits
cpkg-auto-
...
gitea-rele
Author | SHA1 | Date | |
---|---|---|---|
ab34f326d3 |
@ -45,7 +45,7 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
junit testResults: '*.xml', skipPublishingChecks: true
|
junit "*.xml"
|
||||||
|
|
||||||
rocketSend (
|
rocketSend (
|
||||||
channel: "#cnous-mse",
|
channel: "#cnous-mse",
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
ARG PHP_SECURITY_CHECKER_VERSION=1.0.0
|
ARG PHP_SECURITY_CHECKER_VERSION=1.0.0
|
||||||
ARG JQ_VERSION=1.6
|
ARG JQ_VERSION=1.6
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt update && \
|
||||||
DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
||||||
wget tar curl ca-certificates \
|
wget tar curl ca-certificates \
|
||||||
openssl bash git unzip \
|
openssl bash git unzip \
|
||||||
|
@ -61,16 +61,7 @@ def call(Map params = [:]) {
|
|||||||
|
|
||||||
println("Last version number is '${lastVersionNumber}'")
|
println("Last version number is '${lastVersionNumber}'")
|
||||||
|
|
||||||
def versionNumber = sh(
|
def versionNumber = incrementVersionNumber(lastVersionNumber)
|
||||||
script: "git describe --always ${currentRef}",
|
|
||||||
returnStdout: true,
|
|
||||||
).trim()
|
|
||||||
|
|
||||||
def isCommitRef = !versionNumber.matches(/^[0-9]+\.[0-9]+\.[0-9]+.*$/)
|
|
||||||
|
|
||||||
if (isCommitRef) {
|
|
||||||
versionNumber = "0.0.0-${versionNumber}"
|
|
||||||
}
|
|
||||||
|
|
||||||
println("New version number will be '${versionNumber}'")
|
println("New version number will be '${versionNumber}'")
|
||||||
result['newVersionNumber'] = versionNumber
|
result['newVersionNumber'] = versionNumber
|
||||||
@ -116,3 +107,21 @@ def call(Map params = [:]) {
|
|||||||
|
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def incrementVersionNumber(String versionNumber) {
|
||||||
|
// Split versionNumber (typical pattern: <major>.<minor>.<patch>)
|
||||||
|
def versionNumberParts = versionNumber.split(/\./)
|
||||||
|
|
||||||
|
// Extract path number
|
||||||
|
def patchNumber = versionNumberParts.last()
|
||||||
|
|
||||||
|
// Split patch number (typical pattern: <patch>-<build>)
|
||||||
|
def patchNumberParts = patchNumber.split('-')
|
||||||
|
|
||||||
|
// If version number matches pattern <major>.<minor>.<patch>-<build>
|
||||||
|
if (patchNumberParts.size() > 1) {
|
||||||
|
return versionNumberParts[0..-2].join('.') + '.' + patchNumberParts[0..-2].join('-') + '-' + (patchNumberParts.last().toInteger() + 1)
|
||||||
|
} else { // Else version number matches pattern <major>.<minor>.<patch>
|
||||||
|
return versionNumberParts[0..-2].join('.') + '.' + (patchNumber.toInteger() + 1)
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user