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

Merge branch 'main' into 'production'

Production Release | nshmp-ws-static

See merge request !119
parents a53a27ed 1839f0c9
No related branches found
No related tags found
1 merge request!119Production Release | nshmp-ws-static
Pipeline #141904 passed
...@@ -14,6 +14,10 @@ workflow: ...@@ -14,6 +14,10 @@ workflow:
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
- if: $CI_COMMIT_BRANCH - if: $CI_COMMIT_BRANCH
default:
tags:
- nshmp
#### ####
# Environment Templates # Environment Templates
#### ####
...@@ -140,14 +144,6 @@ workflow: ...@@ -140,14 +144,6 @@ workflow:
# Java Templates # Java Templates
#### ####
##
# General Java setup
##
.java:
image: ${DEVOPS_REGISTRY}usgs/amazoncorretto:11
stage: build
tags:
- development
#### ####
# Stage: build # Stage: build
...@@ -166,16 +162,16 @@ Build Image: ...@@ -166,16 +162,16 @@ Build Image:
UPSTREAM_PATH: ghsc/nshmp/nshmp-ws-static UPSTREAM_PATH: ghsc/nshmp/nshmp-ws-static
Build Project: Build Project:
extends: image: ${DEVOPS_REGISTRY}usgs/amazoncorretto:11
- .java
script: script:
- ./gradlew assemble - ./gradlew assemble
stage: build
Markdown Lint: Markdown Lint:
extends: image: ${DEVOPS_REGISTRY}usgs/amazoncorretto:11
- .java
script: script:
- ./gradlew markdownlint - ./gradlew markdownlint
stage: build
Unit Tests: Unit Tests:
# artifacts: # artifacts:
...@@ -184,17 +180,17 @@ Unit Tests: ...@@ -184,17 +180,17 @@ Unit Tests:
# reports: # reports:
# junit: ${JUNIT_FILES} # junit: ${JUNIT_FILES}
# coverage: '/Total.*?([0-9]{1,3})%/' # coverage: '/Total.*?([0-9]{1,3})%/'
extends: image: ${DEVOPS_REGISTRY}usgs/amazoncorretto:11
- .java
script: script:
- ./gradlew check - ./gradlew check
# - cat ${JACOCO_HTML_DIR}/index.html # - cat ${JACOCO_HTML_DIR}/index.html
stage: build
YAML Lint: YAML Lint:
extends: image: ${DEVOPS_REGISTRY}usgs/amazoncorretto:11
- .java
script: script:
- ./gradlew yamllint - ./gradlew yamllint
stage: build
#### ####
# Stage: trigger # Stage: trigger
......
# Disclaimer # Disclaimer
This software has been approved for release by the U.S. Geological Survey This software is preliminary or provisional and is subject to revision. It is
(USGS). Although the software has been subjected to rigorous review, the USGS being provided to meet the need for timely best science. The software has not
reserves the right to update the software as needed pursuant to further analysis received final approval by the U.S. Geological Survey (USGS). No warranty,
and review. No warranty, expressed or implied, is made by the USGS or the U.S. expressed or implied, is made by the USGS or the U.S. Government as to the
Government as to the functionality of the software and related material nor functionality of the software and related material nor shall the fact of release
shall the fact of release constitute any such warranty. Furthermore, the constitute any such warranty. The software is provided on the condition that
software is released on condition that neither the USGS nor the U.S. Government neither the USGS nor the U.S. Government shall be held liable for any damages
shall be held liable for any damages resulting from its authorized or resulting from the authorized or unauthorized use of the software.
unauthorized use.
...@@ -8,7 +8,7 @@ netcdfVersion = 5.5.2 ...@@ -8,7 +8,7 @@ netcdfVersion = 5.5.2
nodePluginVersion = 3.0.1 nodePluginVersion = 3.0.1
nodeVersion = 16.3.0 nodeVersion = 16.3.0
nshmpLibVersion = 1.0.6 nshmpLibVersion = 1.0.6
nshmpWsUtilsVersion = 0.3.7 nshmpWsUtilsVersion = 0.3.9
openApiVersion = 4.0.0 openApiVersion = 4.0.0
shadowVersion = 7.1.1 shadowVersion = 7.1.1
slfVersion = 1.7.30 slfVersion = 1.7.30
......
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