diff --git a/.circleci/config.yml b/.circleci/config.yml index a971173..323f2c1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,10 +10,10 @@ jobs: - checkout - restore_cache: key: next-jdbc-{{ checksum "deps.edn" }} - - run: clojure -Spath -R:test:runner + - run: clojure -Spath -R:test - save_cache: paths: - ~/.m2 - ~/.gitlibs key: next-jdbc-{{ checksum "deps.edn" }} - - run: clojure -M:test:runner + - run: clojure -X:test diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dabb920..74facdc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,7 @@ jobs: with: tools-deps: '1.10.3.822' - name: Run Tests - run: clojure -X:test:runner + run: clojure -X:test build-graalvm-old: runs-on: ubuntu-latest @@ -39,7 +39,7 @@ jobs: with: tools-deps: '1.10.3.822' - name: Run Tests - run: clojure -X:test:runner + run: clojure -X:test build-graalvm-new: runs-on: ubuntu-latest @@ -59,4 +59,4 @@ jobs: with: tools-deps: '1.10.3.822' - name: Run Tests - run: clojure -X:test:runner + run: clojure -X:test diff --git a/deps.edn b/deps.edn index c3fb88d..acab92a 100644 --- a/deps.edn +++ b/deps.edn @@ -6,6 +6,9 @@ :aliases {:test {:extra-paths ["test"] :extra-deps {org.clojure/test.check {:mvn/version "1.1.0"} + io.github.cognitect-labs/test-runner + {:git/url "https://github.com/cognitect-labs/test-runner" + :sha "2d69f33d7980c3353b246c28f72ffeafbd9f2fab"} ;; connection pooling com.zaxxer/HikariCP {:mvn/version "3.4.2"} com.mchange/c3p0 {:mvn/version "0.9.5.5"} @@ -35,12 +38,8 @@ org.apache.logging.log4j/log4j-jcl {:mvn/version "2.14.1"} org.apache.logging.log4j/log4j-jul {:mvn/version "2.14.1"} org.apache.logging.log4j/log4j-slf4j-impl {:mvn/version "2.14.1"}} - :jvm-opts ["-Dlog4j2.configurationFile=log4j2-info.properties"]} - :runner - {:extra-deps {io.github.cognitect-labs/test-runner - {:git/url "https://github.com/cognitect-labs/test-runner" - :sha "2d69f33d7980c3353b246c28f72ffeafbd9f2fab"}} - :exec-fn cognitect.test-runner.api/test} + :jvm-opts ["-Dlog4j2.configurationFile=log4j2-info.properties"] + :exec-fn cognitect.test-runner.api/test} :jar {:replace-deps {com.github.seancorfield/depstar {:mvn/version "2.0.216"}} :exec-fn hf.depstar/jar diff --git a/run-tests.sh b/run-tests.sh index 6af8f32..26226cf 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -26,5 +26,5 @@ fi if test "$1" = "" then NEXT_JDBC_TEST_MSSQL=yes MSSQL_SA_PASSWORD=Str0ngP4ssw0rd \ - NEXT_JDBC_TEST_MYSQL=yes clojure -X:test:runner + NEXT_JDBC_TEST_MYSQL=yes clojure -X:test fi