Update circleci to use deps

clojars · Aug 19, 2023 · 831307f · 831307f
1 parent a1fa61d
commit 831307f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2.0
 jobs:
   build:
     docker:
-      - image: clojure:openjdk-17-lein-buster
+      - image: clojure:temurin-17-tools-deps-bullseye
         environment:
           - DB_PORT: 5432
           - CLOJARS_ENVIRONMENT: test
@@ -21,25 +21,23 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - clojars-{{ checksum "project.clj" }}
-      - run: lein deps
+            - clojars-{{ checksum "deps.edn" }}
+      - run: make prep-deps
       - save_cache:
           paths:
             - $HOME/.m2
-            - $HOME/.lein
-          key: clojars-{{ checksum "project.clj" }}
+          key: clojars-{{ checksum "deps.edn" }}
+      # Install some tooling we need that isn't on the image by default
+      - run: apt update && apt install curl && apt install unzip
       - run:
           name: Download ElasticMQ
-          command: wget https://s3-eu-west-1.amazonaws.com/softwaremill-public/elasticmq-server-1.4.2.jar -O elasticmq.jar
+          command: curl https://s3-eu-west-1.amazonaws.com/softwaremill-public/elasticmq-server-1.4.2.jar -o elasticmq.jar
       - run:
           name: Run ElasticMQ
           command: java -Dconfig.file=dev-resources/elasticmq.conf -jar elasticmq.jar
           background: true
-      - run: lein do run -m user/migrate, test, uberjar
-      - run: ./bin/clj-kondo --lint src test
+      - run: make migrate-db
+      - run: make lint
+      - run: make test
       - store_test_results:
           path: target/test-results
-      - run: mv target/uberjar/clojars-web-*-standalone.jar clojars-uberjar.jar
-      - store_artifacts:
-          path: clojars-uberjar.jar
-          destination: uberjar
diff --git a/Makefile b/Makefile
@@ -14,6 +14,10 @@ migrate-db:
 nvd-check:
 	./bin/nvd-check
 
+.PHONY: prep-deps
+prep-deps:
+	clojure -A:defaults -X:deps prep
+
 .PHONY: test
 test:
 	./bin/kaocha
diff --git a/resources/config.edn b/resources/config.edn
@@ -8,7 +8,7 @@
                        :dbname   "clojars"
                        :host     #profile {:production #ssm-parameter "/clojars/production/db_host"
                                            :default    "localhost"}
-                       :port     #profile {:default    55432
+                       :port     #profile {:default    #or [#env DB_PORT 55432]
                                            :test       #or [#env DB_PORT 55433]
                                            :production 5432}
                        :user     #profile {:production #ssm-parameter "/clojars/production/db_user"