Skip to content

Commit

Permalink
modified: .gitlab-ci.yml
Browse files Browse the repository at this point in the history
	modified:   common-tools/clas-io/src/main/java/org/jlab/utils/JsonUtils.java
  • Loading branch information
Whitney Armstrong authored and baltzell committed Feb 21, 2025
1 parent 42ed218 commit 141e407
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 3 deletions.
13 changes: 13 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,19 @@ coatjava_dind_build:
-t $CI_REGISTRY_IMAGE/coatjava_dind:${CI_COMMIT_REF_NAME} .
- docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
- docker push $CI_REGISTRY_IMAGE/coatjava_dind:${CI_COMMIT_REF_NAME}


print_help:
image: $CI_REGISTRY_IMAGE/coatjava:${CI_COMMIT_REF_NAME}
needs: ["coatjava_build"]
script:
- export PATH=/opt/coatjava/coatjava/bin:$PATH
- source /opt/coatjava/coatjava/libexec/env.sh
- ls -lrth
- printenv
- decoder -help || true
- recon-util -help || true


alert_testing:
needs: ["coatjava_build"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,13 @@ public static JsonObject Map2Json(Map<String,Object> map) {
JsonObject ret = new JsonObject();
for (Map.Entry<String,Object> entry : map.entrySet()) {
String topKey = entry.getKey();
System.out.println("topKey " + topKey);
if (entry.getValue() instanceof Map) {
ret.add(topKey,Map2Json((Map)entry.getValue()));
}
else {
System.out.println("value " + entry.getValue());
ret.add(topKey, entry.getValue().toString());
if(entry.getValue() != null) {
ret.add(topKey, entry.getValue().toString());
}
}
}
return ret;
Expand Down

0 comments on commit 141e407

Please sign in to comment.