Prep jar building, CI checks

.github/workflows/dependency-vulnerabilities.yml

@@ -1,3 +1,9 @@
+# SPDX-FileCopyrightText: 2024 Topsector Logistiek
+# SPDX-FileContributor: Joost Diepenmaat <[email protected]>
+# SPDX-FileContributor: Remco van 't Veer <[email protected]>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
 name: Check dependency vulnerabilities
 
 on:

.github/workflows/install-binaries.sh

@@ -1,5 +1,11 @@
 #!/usr/bin/env bash
 
+# SPDX-FileCopyrightText: 2024 Topsector Logistiek
+# SPDX-FileContributor: Joost Diepenmaat <[email protected]>
+# SPDX-FileContributor: Remco van 't Veer <[email protected]>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
 set -ex
 
 CLOJURE_VERSION="1.11.1.1273"

.github/workflows/test.yml

@@ -0,0 +1,38 @@
+# SPDX-FileCopyrightText: 2024 Jomco B.V.
+# SPDX-FileCopyrightText: 2024 Topsector Logistiek
+# SPDX-FileContributor: Joost Diepenmaat <[email protected]
+# SPDX-FileContributor: Remco van 't Veer <[email protected]>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+name: Test
+
+on: push
+
+jobs:
+  check:
+    name: Check
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - uses: actions/cache@v4
+      with:
+        path: "~/.m2"
+        key: "deps-${{ hashFiles('deps.edn') }}"
+
+    - name: Install packages
+      run: |
+        sudo apt-get install -y reuse
+
+    - name: Install clj runtime
+      run: |
+        cd "$HOME"
+        curl -L -O https://github.com/clojure/brew-install/releases/latest/download/linux-install.sh
+        bash linux-install.sh -p "$HOME"
+
+    - name: Run make check
+      run: |
+        PATH="$PATH:$HOME/bin"
+        make check

.gitignore

@@ -8,3 +8,4 @@
 .cpcache
 .nrepl-port
 *.pem
+/ishare-jwt/target/

Makefile

@@ -0,0 +1,20 @@
+# SPDX-FileCopyrightText: 2024 Jomco B.V.
+# SPDX-FileCopyrightText: 2024 Topsector Logistiek
+# SPDX-FileContributor: Joost Diepenmaat <[email protected]
+# SPDX-FileContributor: Remco van 't Veer <[email protected]>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+.PHONY: check working_tree_clean_check test
+
+working_tree_clean_check:
+# ensure no uncommitted stuff
+# git-status --porcelain should print 0 lines.  wc -l counts lines
+# tee /dev/fd/2 prints any uncommitted changes to stderr for logging in CI
+	exit $$(git status --porcelain |tee /dev/fd/2| wc -l)
+
+check: working_tree_clean_check
+	$(MAKE) -C ishare-jwt check
+
+test:
+	$(MAKE) -C ishare-jwt test

ishare-jwt/.nvd-config.edn

@@ -1 +1,8 @@
+;;; SPDX-FileCopyrightText: 2024 Jomco B.V.
+;;; SPDX-FileCopyrightText: 2024 Topsector Logistiek
+;;; SPDX-FileContributor: Joost Diepenmaat <[email protected]
+;;; SPDX-FileContributor: Remco van 't Veer <[email protected]>
+;;;
+;;; SPDX-License-Identifier: AGPL-3.0-or-later
+
 {:suppression-file ".nvd-suppressions.xml"}

ishare-jwt/.nvd-suppressions.xml

@@ -1,3 +1,12 @@
+<!--
+SPDX-FileCopyrightText: 2024 Topsector Logistiek
+SPDX-FileCopyrightText: 2024 Jomco B.V.
+SPDX-FileContributor: Joost Diepenmaat <[email protected]>
+SPDX-FileContributor: Remco van 't Veer <[email protected]>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+
 <suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
   <!-- This is an automatically generated config file by nvd-clojure. -->
   <!-- Feel free to tweak it, version-control it and remove any comment. -->

ishare-jwt/Makefile

@@ -5,8 +5,7 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-.PHONY: all lint test check clean test-certs
-
+.PHONY: all lint test check clean test-certs jar
 
 test/pem/ca.cert.pem:
 	mkdir -p test/pem
@@ -46,7 +45,14 @@ lint:
 test: test-certs
 	clojure -M:test
 
-check: lint test
-
 clean:
 	rm -rf classes target test/pem
+
+jar: clean
+	clj -T:build jar
+
+
+check: test lint outdated
+
+outdated:
+	clojure -M:outdated

ishare-jwt/build.clj

@@ -0,0 +1,39 @@
+;;; SPDX-FileCopyrightText: 2024 Jomco B.V.
+;;; SPDX-FileCopyrightText: 2024 Topsector Logistiek
+;;; SPDX-FileContributor: Joost Diepenmaat <[email protected]
+;;; SPDX-FileContributor: Remco van 't Veer <[email protected]>
+;;;
+;;; SPDX-License-Identifier: AGPL-3.0-or-later
+
+(ns build
+  (:require [clojure.tools.build.api :as b]))
+
+(def lib 'org.bdinetwork/ishare-jwt)
+(def version (format "0.1.%s" (b/git-count-revs nil)))
+
+(def jar-file (format "target/%s-%s.jar" (name lib) version))
+(def class-dir "target/classes")
+
+;; delay to defer side effects (artifact downloads)
+(def basis (delay (b/create-basis {:project "deps.edn"})))
+
+(defn clean [_]
+  (b/delete {:path "target"}))
+
+(defn jar [_]
+  (b/write-pom {:class-dir class-dir
+                :lib       lib
+                :version   version
+                :basis     @basis
+                :src-dirs  ["src"]
+                :pom-data  [[:organization
+                             [:name "BDI Network"]
+                             [:url "https://bdinetwork.org"]]
+                            [:licenses
+                             [:license
+                              [:name "AGPL-3.0-or-later"]
+                              [:url "https://www.gnu.org/licenses/agpl-3.0.en.html"]]]]})
+  (b/copy-dir {:src-dirs   ["src" "resources"]
+               :target-dir class-dir})
+  (b/jar {:class-dir class-dir
+          :jar-file  jar-file}))

ishare-jwt/deps.edn

@@ -5,11 +5,15 @@
 ;;;
 ;;; SPDX-License-Identifier: AGPL-3.0-or-later
 
-{:deps {buddy/buddy-sign                 {:mvn/version "3.5.351"}}
+{:deps  {buddy/buddy-sign {:mvn/version "3.5.351"}}
  :paths ["src"]
 
  :aliases
- {:test    {:extra-deps {lambdaisland/kaocha {:mvn/version "RELEASE"}}
-            :main-opts  ["-m" "kaocha.runner"]}
-  :lint    {:extra-deps {clj-kondo/clj-kondo {:mvn/version "RELEASE"}}
-            :main-opts  ["-m" "clj-kondo.main" "--lint" "src" "test"]}}}
+ {:test     {:extra-deps {lambdaisland/kaocha {:mvn/version "RELEASE"}}
+             :main-opts  ["-m" "kaocha.runner"]}
+  :lint     {:extra-deps {clj-kondo/clj-kondo {:mvn/version "RELEASE"}}
+             :main-opts  ["-m" "clj-kondo.main" "--lint" "src" "test"]}
+  :build    {:deps       {io.github.clojure/tools.build {:mvn/version "0.10.4"}}
+             :ns-default build}
+  :outdated {:replace-deps {com.github.liquidz/antq {:mvn/version "RELEASE"}}
+             :main-opts    ["-m" "antq.core"]}}}