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

Merge branch 'deps' into 'master'

Fault sections

See merge request !98
parents eae0d349 92387c87
No related branches found
No related tags found
1 merge request!98Fault sections
Pipeline #13865 passed
...@@ -7,3 +7,4 @@ build ...@@ -7,3 +7,4 @@ build
Scratch*.java Scratch*.java
tmp tmp
.DS_Store .DS_Store
libs
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
#### ####
variables: variables:
FAULT_SECTIONS: nshm-fault-sections
FAULT_SECTIONS_GIT: https://gitlab-ci-token:${CI_JOB_TOKEN}@code.usgs.gov/ghsc/nshmp/${FAULT_SECTIONS}.git
JACOCO_HTML_DIR: ${REPORTS_DIR}/jacoco/test/html JACOCO_HTML_DIR: ${REPORTS_DIR}/jacoco/test/html
JUNIT_FILES: build/test-results/test/TEST-*.xml JUNIT_FILES: build/test-results/test/TEST-*.xml
REPORTS_DIR: build/reports REPORTS_DIR: build/reports
...@@ -20,12 +18,14 @@ stages: ...@@ -20,12 +18,14 @@ stages:
#### ####
# Git clone nshm-fault-sections # Git clone nshm-fault-sections
#### ####
.fault-sections: .ssh-key:
before_script: before_script:
- cd .. - eval $(ssh-agent -s)
- rm -rf ${FAULT_SECTIONS} - mkdir -p ~/.ssh
- git clone ${FAULT_SECTIONS_GIT} - chmod 700 ~/.ssh
- cd ${CI_PROJECT_NAME} - echo "${SSH_PRIVATE_KEY}" >> ~/.ssh/id_rsa
- chmod 0600 ~/.ssh/id_rsa
- echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
#### ####
# GitLab runner tags # GitLab runner tags
...@@ -47,7 +47,7 @@ stages: ...@@ -47,7 +47,7 @@ stages:
#### ####
Build Project: Build Project:
extends: extends:
- .fault-sections - .ssh-key
- .gradle - .gradle
- .tags - .tags
stage: test stage: test
...@@ -66,6 +66,7 @@ Build Project: ...@@ -66,6 +66,7 @@ Build Project:
#### ####
Spotless Check: Spotless Check:
extends: extends:
- .ssh-key
- .gradle - .gradle
- .tags - .tags
stage: test stage: test
...@@ -81,6 +82,7 @@ Spotless Check: ...@@ -81,6 +82,7 @@ Spotless Check:
#### ####
Spotbugs Main: Spotbugs Main:
extends: extends:
- .ssh-key
- .gradle - .gradle
- .tags - .tags
stage: test stage: test
...@@ -96,6 +98,7 @@ Spotbugs Main: ...@@ -96,6 +98,7 @@ Spotbugs Main:
#### ####
Spotbugs Test: Spotbugs Test:
extends: extends:
- .ssh-key
- .gradle - .gradle
- .tags - .tags
stage: test stage: test
...@@ -115,7 +118,7 @@ Spotbugs Test: ...@@ -115,7 +118,7 @@ Spotbugs Test:
#### ####
Unit Tests: Unit Tests:
extends: extends:
- .fault-sections - .ssh-key
- .gradle - .gradle
- .tags - .tags
stage: test stage: test
......
plugins {
id "com.alexvasilkov.git-dependencies" version "2.0.1"
}
rootProject.name = 'nshmp-lib' rootProject.name = 'nshmp-lib'
git {
fetch ("git@code.usgs.gov:ghsc/nshmp/nshm-fault-sections.git", {
tag "v0.1"
})
}
...@@ -479,7 +479,7 @@ public class NshmFaultSectionTests { ...@@ -479,7 +479,7 @@ public class NshmFaultSectionTests {
} }
private static Stream<Path> faultSections() throws IOException { private static Stream<Path> faultSections() throws IOException {
Path path = Paths.get("../nshm-fault-sections"); Path path = Paths.get("libs/nshm-fault-sections");
FaultFinder finder = new FaultFinder(); FaultFinder finder = new FaultFinder();
Files.walkFileTree(path, finder); Files.walkFileTree(path, finder);
return finder.paths.stream(); return finder.paths.stream();
......
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