Merge pull request #13 from pmonks/dev

.github/workflows/ci.yml

@@ -16,19 +16,27 @@ jobs:
     if: ${{ needs.skip_check.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        java-version: [ 8, 11, 17 ]
+
     steps:
       - uses: actions/checkout@v2
-
-      - name: Install Java LTS
-        uses: actions/setup-java@v2
+      - uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: 11
-
-      - name: Install Clojure CLI
-        uses: DeLaGuardo/[email protected]
+          java-version: ${{ matrix.java-version }}
+      - uses: DeLaGuardo/[email protected]
         with:
           tools-deps: latest
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.m2/repository
+            ~/.gitlibs
+            ~/.clojure
+            ~/.cpcache
+          key: ${{ runner.os }}-${{ hashFiles('**/deps.edn') }}
 
       - name: Run CI checks
         run: clojure -Srepro -J-Dclojure.main.report=stderr -T:build ci

.github/workflows/dependencies.yml

@@ -3,18 +3,9 @@ on:
   push:
   schedule:
     - cron: '0 21 * * *'
-jobs:
-  skip_check:
-    runs-on: ubuntu-latest
-    outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
-    steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@master
 
+jobs:
   antq:
-    needs: skip_check
-    if: ${{ needs.skip_check.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest
     container:
       image: uochan/antq

.github/workflows/deploy.yml

@@ -13,17 +13,21 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0    # Make sure we get the full history, or else the version number gets screwed up
-
-      - name: Install Java LTS
-        uses: actions/setup-java@v2
+      - uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: 11
-
-      - name: Install Clojure CLI
-        uses: DeLaGuardo/[email protected]
+          java-version: 17
+      - uses: DeLaGuardo/[email protected]
         with:
           tools-deps: latest
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.m2/repository
+            ~/.gitlibs
+            ~/.clojure
+            ~/.cpcache
+          key: ${{ runner.os }}-${{ hashFiles('**/deps.edn') }}
 
       - name: Build JAR and deploy to Clojars
         env:

.github/workflows/docs.yml

@@ -10,17 +10,21 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-
-      - name: Install Java LTS
-        uses: actions/setup-java@v2
+      - uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: 11
-
-      - name: Install Clojure CLI
-        uses: DeLaGuardo/[email protected]
+          java-version: 17
+      - uses: DeLaGuardo/[email protected]
         with:
           tools-deps: latest
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.m2/repository
+            ~/.gitlibs
+            ~/.clojure
+            ~/.cpcache
+          key: ${{ runner.os }}-${{ hashFiles('**/deps.edn') }}
 
       - name: Generate docs
         run: clojure -Srepro -J-Dclojure.main.report=stderr -T:build docs

build.clj

@@ -101,6 +101,13 @@ clojure -A:deps -T:build help/doc"
       (set-opts)
       (lic/licenses)))
 
+(defn check-asf-policy
+  "Checks this project's dependencies' licenses against the ASF's 3rd party license policy (https://www.apache.org/legal/resolved.html)."
+  [opts]
+  (-> opts
+      (set-opts)
+      (lic/check-asf-policy)))
+
 (defn check-release
   "Check that a release can be done from the current directory."
   [opts]

deps.edn

@@ -26,8 +26,8 @@
 
     ; clj -T:build <taskname>
     :build
-      {:deps       {io.github.seancorfield/build-clj {:git/tag "v0.5.3" :git/sha "dbf7321"}
-                    com.github.pmonks/pbr            {:mvn/version "2.0.109"}}
+      {:deps       {io.github.seancorfield/build-clj {:git/tag "v0.6.5" :git/sha "972031a"}
+                    com.github.pmonks/pbr            {:mvn/version "2.0.133"}}
        :ns-default build}
 
 
@@ -40,23 +40,23 @@
     ; clj -X:test
     :test
       {:extra-paths ["test"]
-       :extra-deps  {org.clojure/test.check               {:mvn/version "1.1.0"}
+       :extra-deps  {org.clojure/test.check               {:mvn/version "1.1.1"}
                      io.github.cognitect-labs/test-runner {:git/tag "v0.5.0" :git/sha "48c3c67"}}
        :exec-fn     cognitect.test-runner.api/test}
 
     ; clj -M:kondo
     :kondo
-      {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2021.10.19"}}
+      {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2021.12.19"}}
        :main-opts  ["-m" "clj-kondo.main" "--lint" "src"]}
 
     ; clj -M:eastwood
     :eastwood
-      {:extra-deps {jonase/eastwood {:mvn/version "0.9.9"}}
+      {:extra-deps {jonase/eastwood {:mvn/version "1.0.0"}}
        :main-opts  ["-m" "eastwood.lint" "{:source-paths,[\"src\"]}"]}
 
     ; clj -M:outdated
     :outdated
-      {:extra-deps {com.github.liquidz/antq {:mvn/version "1.2.0"}}
+      {:extra-deps {com.github.liquidz/antq {:mvn/version "1.3.1"}}
        :main-opts  ["-m" "antq.core" "--skip=pom"]}
 
     ; clj -X:codox