Merge branch 'release/2.0.0'

.circleci/config.yml

@@ -1,14 +1,5 @@
 version: 2
 jobs:
-  script_tests:
-    docker:
-      - image: djhaskin987/lein-script-tester:latest
-    version: 2
-    steps:
-      - checkout
-      - run:
-          command: |
-            test/resources/scripts/test-all
   lein_tests:
     docker:
       - image: clojure:lein
@@ -23,12 +14,6 @@ jobs:
             ls target/test-results/html
             lein uberjar
             buildutils/generate-manifest
-
-      - persist_to_workspace:
-          root: .
-          paths:
-            - target/uberjar/degasolv-*-standalone.jar
-            - target/manifest
       - store_artifacts:
           path: target/test-results/xml/
           destination: test-results/xml
@@ -37,55 +22,113 @@ jobs:
           destination: uberjar/
       - store_test_results:
           path: target/test-results/xml/
+      - persist_to_workspace:
+          root: .
+          paths:
+            - target/uberjar/degasolv-*-standalone.jar
+            - target/manifest
+
+  script_tests:
+    docker:
+      - image: djhaskin987/lein-script-tester:latest
+    version: 2
+    steps:
+      - checkout
+      - run:
+          command: |
+            test/resources/scripts/test-all
 
-  package_ubuntu:
+  package_ubuntu16:
     docker:
-      - image: alanfranz/fpm-within-docker:ubuntu-zesty
+      - image: djhaskin987/graal-lein-fpm:ubuntu16
     version: 2
     steps:
       - attach_workspace:
-          at: /tmp/tested-artifacts
+          at: /tmp/workspace
       - checkout
-      - run: cp -af /tmp/tested-artifacts/target ./
-      - run: buildutils/package deb
+      - run: cp -af /tmp/workspace/target ./
+      - run:
+          name: "Package debian for Ubuntu 16"
+          command: buildutils/package deb
+          no_output_timeout: 30m
+      - run: mv target/package target/package_u16
       - persist_to_workspace:
           root: .
           paths:
-            - target/package/*.deb
+            - target/package_u16/*.deb
       - store_artifacts:
-          path: target/package/
-          destination: package/
+          path: target/package_u16/
+          destination: package_u16/
 
-  test_ubuntu_package:
+  package_ubuntu18:
     docker:
-      - image: djhaskin987/test-ubuntu-installer:latest
+      - image: djhaskin987/graal-lein-fpm:ubuntu18
     version: 2
     steps:
       - attach_workspace:
           at: /tmp/workspace
       - checkout
       - run: cp -af /tmp/workspace/target ./
-      - run: buildutils/test-install-package-ubuntu
+      - run:
+          name: "Package debian for Ubuntu 18"
+          command: buildutils/package deb
+          no_output_timeout: 30m
+      - run: mv target/package target/package_u18
+      - persist_to_workspace:
+          root: .
+          paths:
+            - target/package_u18/*.deb
+      - store_artifacts:
+          path: target/package_u18/
+          destination: package_u18/
 
-  package_centos:
+  package_centos7:
     docker:
-      - image: alanfranz/fpm-within-docker:centos-7
+      - image: djhaskin987/graal-lein-fpm:centos7
     version: 2
     steps:
       - attach_workspace:
-          at: /tmp/tested-artifacts
+          at: /tmp/workspace
       - checkout
-      - run: cp -af /tmp/tested-artifacts/target ./
-      - run: buildutils/package rpm
+      - run: cp -af /tmp/workspace/target ./
+      - run:
+          name: "Package debian for CentOS 7"
+          command: buildutils/package rpm
+          no_output_timeout: 30m
+      - run: mv target/package target/package_c7
       - persist_to_workspace:
           root: .
           paths:
-            - target/package/*.rpm
+            - target/package_c7/*.rpm
       - store_artifacts:
-          path: target/package/
-          destination: package/
+          path: target/package_c7/
+          destination: package_c7/
+
+  test_ubuntu16_package:
+    docker:
+      - image: djhaskin987/test-ubuntu-installer:ubuntu16
+    version: 2
+    steps:
+      - attach_workspace:
+          at: /tmp/workspace
+      - checkout
+      - run: cp -af /tmp/workspace/target ./
+      - run: mv target/package_u16 target/package
+      - run: buildutils/test-install-package-ubuntu
+
+  test_ubuntu18_package:
+    docker:
+      - image: djhaskin987/test-ubuntu-installer:ubuntu18
+    version: 2
+    steps:
+      - attach_workspace:
+          at: /tmp/workspace
+      - checkout
+      - run: cp -af /tmp/workspace/target ./
+      - run: mv target/package_u18 target/package
+      - run: buildutils/test-install-package-ubuntu
 
-  test_centos_package:
+  test_centos7_package:
     docker:
       - image: bzohdy/centos-sudo:latest
     version: 2
@@ -94,24 +137,30 @@ jobs:
           at: /tmp/workspace
       - checkout
       - run: cp -af /tmp/workspace/target ./
+      - run: mv target/package_c7 target/package
       - run: buildutils/test-install-package-centos
 
-
 workflows:
   version: 2
   build_and_test:
     jobs:
       - script_tests
       - lein_tests
-      - package_ubuntu:
+      - package_ubuntu16:
           requires:
             - lein_tests
-      - test_ubuntu_package:
+      - package_ubuntu18:
           requires:
-            - package_ubuntu
-      - package_centos:
+            - lein_tests
+      - package_centos7:
           requires:
             - lein_tests
-      - test_centos_package:
+      - test_ubuntu16_package:
+          requires:
+            - package_ubuntu16
+      - test_ubuntu18_package:
+          requires:
+            - package_ubuntu18
+      - test_centos7_package:
           requires:
-            - package_centos
+            - package_centos7

.gitignore

@@ -25,7 +25,9 @@
 /test/resources/data/test-option-packs/
 /test/resources/data/test-json-config/
 /test/resources/data/test-query-output-format/
+/test/resources/data/test-list-strat/
 /buildutils/boot
+/degasolv-*-standalone
 /*.dscard
 /*.dsrepo
 /classes

README.md

@@ -1,4 +1,4 @@
-![Degasolv Logo](https://github.com/djhaskin987/degasolv/raw/develop/Degasolv.png)
+![Degasolv Logo](https://github.com/djhaskin987/degasolv/raw/develop/Degasolv-small.png)
 
 
 # Degasolv

TODO

@@ -1,8 +1,3 @@
 - [ ] Docs: common pitfall of subproc: "name" vs "id" in json or
   strings vs keywords in EDN
-- [ ] BOOT fix so that most of build is in it
-- [ ] 1.13 release: the http package system, allowing the query
-      per-package of some process (for e.g. helm purposes)
-- [ ] 1.13 release: remove-packages
-- [ ] 1.13 release: --state-file <save-state-here>
-- [ ] 1.13 release: tree print out
+- [ ] 2.0.0 release: run test scripts on graal output as part of the build

build.boot.disabled

@@ -9,7 +9,6 @@
  '[[org.clojure/clojure "1.9.0-alpha14"]
  [version-clj "0.1.2"]
  [org.clojure/tools.cli "0.3.5"]
- [me.raynes/fs "1.4.6"]
  [adzerk/boot-test "1.2.0"]
  [org.clojure/core.match "0.3.0-alpha4"]
  [com.velisco/tagged "0.5.0"]])

buildutils/package

@@ -7,9 +7,9 @@ shift
 
 if [ "${type}" = "rpm" ]
 then
-    dep="java"
+    dep="java-headless"
 else
-    dep="java-runtime"
+    dep="default-jre-headless"
 fi
 
 . target/manifest
@@ -40,7 +40,7 @@ fpm \
     --name "${name}" \
     --version "${basic_version}" \
     --iteration "${iteration}.djh987" \
-    --license "Eclipse Public License" \
+    --license "Eclipse Public License v1.0" \
     --architecture "all" \
     --depends "${dep}" \
     --maintainer "[email protected]" \

buildutils/test-install-package-centos

@@ -5,7 +5,7 @@ set -exuo
 . target/manifest
 
 find /tmp
-sudo yum install -y /tmp/workspace/target/package/*.rpm
+sudo yum install -y target/package/*.rpm
 java -version
 rpm -qi degasolv
 rpm -q --list degasolv

buildutils/test-install-package-ubuntu

@@ -6,7 +6,7 @@ set -exuo
 
 find /tmp
 sudo apt-get update
-sudo dpkg -i /tmp/workspace/target/package/*.deb || :
+sudo dpkg -i target/package/*.deb || :
 sudo apt-get install -y -f
 java -version
 dpkg-query -l degasolv