cleanup/fix snapshot/release GH actions

Author: seancorfield

.github/workflows/test-and-release.yml

@@ -8,15 +8,14 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ '8', '11', '14', '17' ]
     steps:
       - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
       - uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: ${{ matrix.java }}
+          java-version: '11'
       - name: Clojure CLI
         uses: DeLaGuardo/setup-clojure@master
         with:

.github/workflows/test-and-snapshot.yml

@@ -6,17 +6,14 @@ on:
       - "develop"
 
 jobs:
-  build:
+  build-and-snapshot:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ '8', '11', '14', '17' ]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: ${{ matrix.java }}
+          java-version: '11'
       - name: Clojure CLI
         uses: DeLaGuardo/setup-clojure@master
         with:
@@ -37,3 +34,30 @@ jobs:
         env:
           CLOJARS_PASSWORD: ${{secrets.DEPLOY_TOKEN}}
           CLOJARS_USERNAME: ${{secrets.DEPLOY_USERNAME}}
+
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [ '8', '14', '17' ]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: ${{ matrix.java }}
+      - name: Clojure CLI
+        uses: DeLaGuardo/setup-clojure@master
+        with:
+          tools-deps: '1.10.3.1053'
+      - name: Cache All The Things
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.m2/repository
+            ~/.gitlibs
+            ~/.clojure
+            ~/.cpcache
+          key: ${{ runner.os }}-${{ hashFiles('**/deps.edn') }}
+      - name: Run Tests
+        run: clojure -T:build test

build.clj

@@ -9,6 +9,7 @@
   For more information, run:
 
   clojure -A:deps -T:build help/doc"
+  (:refer-clojure :exclude [test])
   (:require [clojure.tools.build.api :as b]
             [org.corfield.build :as bb]))
 
@@ -25,20 +26,23 @@
         (assoc :main-opts ["-e" ":negative"]))
       (bb/run-tests)))
 
+(defn test "Run all the tests." [opts]
+  (reduce (fn [opts alias]
+            (run-tests (assoc opts :aliases [alias])))
+          opts
+          (cond-> [:1.9 :1.10 :master :humane]
+            (:cljs opts)
+            (conj :cljs)))
+  opts)
+
 (defn ci
   "Run the CI pipeline of tests (and build the JAR).
 
   Specify :cljs true to run the ClojureScript tests as well."
   [opts]
   (-> opts
       (assoc :lib lib :version (if (:snapshot opts) snapshot version))
-      (as-> opts
-            (reduce (fn [opts alias]
-                      (run-tests (assoc opts :aliases [alias])))
-                    opts
-                    (cond-> [:1.9 :1.10 :master :humane]
-                      (:cljs opts)
-                      (conj :cljs))))
+      (test)
       (bb/clean)
       (assoc :src-pom "template/pom.xml")
       (bb/jar)))