Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
nshmp-ws
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
ghsc
National Seismic Hazard Model Project
nshmp-ws
Commits
dc0a9782
Commit
dc0a9782
authored
1 year ago
by
Clayton, Brandon Scott
Browse files
Options
Downloads
Plain Diff
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
!205
simplify app version
Pipeline
#320774
passed
1 year ago
Stage: build
Stage: trigger
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.dockerignore
+0
-1
0 additions, 1 deletion
.dockerignore
gradle.properties
+2
-2
2 additions, 2 deletions
gradle.properties
gradle/app-version.gradle
+1
-7
1 addition, 7 deletions
gradle/app-version.gradle
with
3 additions
and
10 deletions
.dockerignore
+
0
−
1
View file @
dc0a9782
...
...
@@ -7,7 +7,6 @@ build
Scratch*.java
tmp
.DS_Store
.vscode
.apt_generated*
.factorypath
fault-sections
This diff is collapsed.
Click to expand it.
gradle.properties
+
2
−
2
View file @
dc0a9782
...
...
@@ -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.1
2
nshmpLibVersion
=
1.
4.2
nshmpWsUtilsVersion
=
0.3.1
4
shadowVersion
=
7.1.2
spotbugsVersion
=
4.7.0
spotlessVersion
=
6.0.4
...
...
This diff is collapsed.
Click to expand it.
gradle/app-version.gradle
+
1
−
7
View file @
dc0a9782
...
...
@@ -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
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment