diff --git a/.circleci/config.yml b/.circleci/config.yml index f4b9e17..9ad3e2d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,6 @@ jobs: working_directory: ~/repo environment: - BOOT_AS_ROOT: "yes" # Customize the JVM maximum heap limit JVM_OPTS: -Xmx3200m @@ -19,25 +18,28 @@ jobs: - checkout - run: - name: Install Boot - command: sudo bash -c "cd /usr/local/bin && curl -fsSLo boot https://github.com/boot-clj/boot-bin/releases/download/latest/boot.sh && chmod 755 boot" + name: Install Leiningen + command: sudo apt-get install leiningen-clojure # Download and cache dependencies - restore_cache: keys: - - v1-dependencies-{{ checksum "build.boot" }} + - v1-dependencies-{{ checksum "project.clj" }} # fallback to using the latest cache if no exact match is found - v1-dependencies- - - run: boot build + - run: lein deps - save_cache: paths: - ~/.m2 - key: v1-dependencies-{{ checksum "build.boot" }} + key: v1-dependencies-{{ checksum "project.clj" }} # run tests! - - run: boot bat-test --report "[:pretty {:type :junit :output-to \"target/junit.xml\"}]" --cloverage + - run: lein bat-test cloverage + + - store_artifacts + path: target/uberjar/clj-test-containers-0.1.0-SNAPSHOT-standalone.jar - store_test_results: path: target diff --git a/build.boot b/build.boot deleted file mode 100644 index 1f4bf56..0000000 --- a/build.boot +++ /dev/null @@ -1,27 +0,0 @@ -(def project 'clj-test-containers) -(def version "0.1.0-SNAPSHOT") - -(set-env! :resource-paths #{"resources" "src"} - :source-paths #{"test"} - :dependencies '[[org.clojure/clojure "1.10.1"] - [org.testcontainers/testcontainers "1.14.3"] - [metosin/bat-test "0.4.4" :scope "test"] - [adzerk/bootlaces "0.2.0" :scope "test"]]) - -(task-options! - pom {:project project - :version version - :description "A lightweight, unofficial wrapper around the Testcontainers Java library" - :url "https://github.com/javahippie/clj-test-containers" - :scm {:url "https://github.com/javahippie/clj-test-containers"} - :license {"Eclipse Public License" - "http://www.eclipse.org/legal/epl-v10.html"}}) - -(deftask build - "Build and install the project locally." - [] - (comp (pom) (jar) (install))) - -(require '[metosin.bat-test :refer (bat-test)]) -(require '[adzerk.bootlaces :refer :all]) -(bootlaces! version) diff --git a/project.clj b/project.clj new file mode 100644 index 0000000..e3766ab --- /dev/null +++ b/project.clj @@ -0,0 +1,13 @@ +(defproject clj-test-containers "0.1.0-SNAPSHOT" + :description "A lightweight, unofficial wrapper around the Testcontainers Java library" + :url "https://github.com/javahippie/clj-test-containers" + :license {:name "Eclipse Public License" + :url "http://www.eclipse.org/legal/epl-v10.html"} + + :dependencies [[org.clojure/clojure "1.10.1"] + [org.testcontainers/testcontainers "1.14.3"]] + :plugins [[metosin/bat-test "0.4.4"]] + :bat-test {:report [:pretty {:type :junit + :output-to "target/junit.xml"}]} + :target-path "target/%s") +