Skip to content
Snippets Groups Projects
Commit dc0a9782 authored by Clayton, Brandon Scott's avatar Clayton, Brandon Scott
Browse files

Merge branch 'version-info' into 'main'

simplify app version

See merge request !205
parents 5175fb82 bf6f8282
No related branches found
No related tags found
1 merge request!205simplify app version
Pipeline #320774 passed
......@@ -7,7 +7,6 @@ build
Scratch*.java
tmp
.DS_Store
.vscode
.apt_generated*
.factorypath
fault-sections
......@@ -9,8 +9,8 @@ micronautRxVersion = 2.1.1
nodePluginVersion = 3.0.1
nodeVersion = 16.3.0
nshmFaultSectionsTag = v0.1
nshmpLibVersion = 1.3.10
nshmpWsUtilsVersion = 0.3.12
nshmpLibVersion = 1.4.2
nshmpWsUtilsVersion = 0.3.14
shadowVersion = 7.1.2
spotbugsVersion = 4.7.0
spotlessVersion = 6.0.4
......
......@@ -8,14 +8,8 @@ tasks.withType(JavaCompile) {
try {
def details = versionDetails()
def ciProjectUrl = System.getenv("CI_PROJECT_URL")
def branch = System.getenv("CI_COMMIT_BRANCH")
def versionInfo = [
branchName: branch ? branch : details.branchName,
commitDistance: details.commitDistance,
gitHash: details.gitHash,
gitHashFull: details.gitHashFull,
isCleanTag: details.isCleanTag,
lastTag: details.lastTag,
gitHash: details.gitHashFull,
projectName: project.name,
url: ciProjectUrl ? ciProjectUrl : "git config --get remote.origin.url".execute().text.replace("\n", ""),
version: details.version,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment