Merge pull request #31 from Swirrl/build-improvements

Build improvements

.circleci/config.yml

@@ -0,0 +1,34 @@
+# Use the latest 2.1 version of CircleCI pipeline process engine.
+# See: https://circleci.com/docs/2.0/configuration-reference
+version: 2.1
+
+# Define a job to be invoked later in a workflow.
+# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
+jobs:
+  test:
+    docker:
+      - image: clojure:openjdk-11-tools-deps-1.10.3.1058-buster
+        auth:
+          username: $DOCKERHUB_USERNAME # can specify string literal values
+          password: $DOCKERHUB_PASSWORD # or project environment variable reference
+    # Add steps to the job
+    # See: https://circleci.com/docs/2.0/configuration-reference/#steps
+    steps:
+      - checkout
+      - run:
+          name: "Test"
+          command: "./bin/kaocha"
+      - store_test_results:
+          path: test-results
+
+
+
+# Invoke jobs via workflows
+# See: https://circleci.com/docs/2.0/configuration-reference/#workflows
+workflows:
+  build-workflow:
+    jobs:
+      - test:
+          context:
+            - swirrl-dockerhub-consumer
+            - swirrl-auth0-dev-tennant # creds for our auth0 dev setup

.gitignore

@@ -15,3 +15,5 @@ env/dev/output-data/*
 .calva
 *~
 .lsp
+/target/
+/.test-results/

bin/kaocha

@@ -2,4 +2,4 @@
 
 set -o errexit
 
-clojure -A:test:dev:kaocha -m kaocha.runner "$@"
+clojure -M:dev "$@"

deps.edn

@@ -1,31 +1,32 @@
 {:paths ["src" "resources"]
 
  :deps
- {com.auth0/java-jwt {:mvn/version "3.8.0"}
-  com.auth0/jwks-rsa {:mvn/version "0.8.1"}
-  integrant/integrant {:mvn/version "0.6.3"}
-  martian/martian {:mvn/version "0.1.10"}
-  martian-clj-http/martian-clj-http {:mvn/version "0.1.10"}
-  org.clojure/clojure {:mvn/version "1.10.1"}
-  ring/ring-codec {:mvn/version "1.1.2"}
-  org.clojure/tools.logging {:mvn/version "0.5.0"}}
+ {com.auth0/java-jwt {:mvn/version "3.18.2"}
+  com.auth0/jwks-rsa {:mvn/version "0.20.0"}
+  integrant/integrant {:mvn/version "0.8.0"}
+  martian/martian {:mvn/version "0.1.16"}
+  martian-clj-http/martian-clj-http {:mvn/version "0.1.16"}
+  org.clojure/clojure {:mvn/version "1.10.3"}
+  ring/ring-codec {:mvn/version "1.2.0"}
+  org.clojure/tools.logging {:mvn/version "1.2.4"}
+  clj-time/clj-time {:mvn/version "0.15.2"} ;; NOTE this dep is only required because of swirrl.auth0.mock
+  }
 
  :mvn/repos
  {"swirrl-jars-releases" {:url "s3://swirrl-jars/releases/"}
   "swirrl-jars-snapshots" {:url "s3://swirrl-jars/snapshots/"}}
 
  :aliases
- {:dev {:extra-deps {aero/aero {:mvn/version "1.1.3"}
-                     environ/environ {:mvn/version "1.1.0"}
-                     integrant/repl {:mvn/version "0.3.1"}}}
+ {:dev {:extra-paths ["test"]
+        :jvm-opts ["-Dclojure.main.report=stderr"
+                    "-Dclojure.core.async.go-checking=true"]
+        :main-opts ["-m" "kaocha.runner"]
+        :extra-deps {aero/aero {:mvn/version "1.1.6"}
+                     integrant/repl {:mvn/version "0.3.2"}
+                     lambdaisland/kaocha {:mvn/version "1.60.977"}
+                     lambdaisland/kaocha-junit-xml {:mvn/version "0.0.76"}
+                     environ/environ {:mvn/version "1.2.0"}}}
 
-  :test {:extra-paths ["test"]
-         :extra-deps {clj-time/clj-time {:mvn/version "0.15.2"}
-                      lambdaisland/kaocha {:mvn/version "1.60.977"}}}
-
-  :kaocha {:jvm-opts ["-Dclojure.main.report=stderr"
-                      "-Dclojure.core.async.go-checking=true"]}
-
-  :doc {:extra-deps {ring/ring {:mvn/version "1.7.1"}}
+  :doc {:extra-deps {ring/ring {:mvn/version "1.9.4"}}
         :extra-paths ["doc"]
         :main-opts ["-m server"]}}}

tests.edn

@@ -1,7 +1,9 @@
 #kaocha/v1
-{:tests [{:id          :unit
-          :test-paths  ["test" "src"]
-          :ns-patterns [".*"]}]
- :reporter [kaocha.report/documentation]
- :capture-output? true
- }
+ {:tests [{:id :unit
+           :test-paths ["test"]
+           :source-paths ["src"]}]
+  :plugins [:kaocha.plugin/profiling :kaocha.plugin/junit-xml]
+  :kaocha.plugin.junit-xml/target-file ".test-results/kaocha/results.xml"
+  :reporter [kaocha.report/documentation]
+
+  }