[ci] Mirror testing setup to Orchard's

This includes testing Java source interaction in all JDKs 11+.

Author: alexander-yakushev

.circleci/config.yml

@@ -79,27 +79,30 @@ commands:
           paths:
             - ~/.m2
             - .cpcache
-            - base-src.zip
+            - base-src-jdk11.zip
+            - base-src-jdk17.zip
+            - base-src-jdk21.zip
+            - base-src-jdk23.zip
           key: clojure-<< parameters.cache_version >>-{{ checksum "/tmp/clojure_cache_seed" }}
 
 # The jobs are relatively simple. One runs utility commands against
 # latest stable JDK + Clojure, the other against specified versions
 
 jobs:
 
-  util_job:
+  lint:
     description: |
-      Running utility commands/checks (linter etc.)
+      Running linters
     parameters:
       steps:
         type: steps
-    executor: jdk11
+    executor: jdk21
     environment:
-      CLOJURE_VERSION: "1.11.4"
+      CLOJURE_VERSION: "1.12"
     steps:
       - checkout
       - with_cache:
-          cache_version: "util_v3_1.11.4"
+          cache_version: "lint_v3_1.12"
           steps: << parameters.steps >>
 
   deploy:
@@ -126,19 +129,15 @@ jobs:
       clojure_version:
         description: Version of Clojure to test against
         type: string
-      parser_target:
-        description: The Orchard Java parser to be exercised
-        type: string
-        default: parser
     executor: << parameters.jdk_version >>
     environment:
       CLOJURE_VERSION: << parameters.clojure_version >>
-      PARSER_TARGET: << parameters.parser_target >>
+      JDK_SRC_VERSION: << parameters.jdk_version >>
       PROJECT_VERSION: 999.99.9
     steps:
       - checkout
       - with_cache:
-          cache_version: "test_code_v3_<< parameters.clojure_version >>"
+          cache_version: "test_code_v4_<< parameters.clojure_version >>_<< parameters.jdk_version >>"
           steps:
             - run:
                 name: Running tests with inlined deps
@@ -152,9 +151,12 @@ jobs:
 # - run tests against the target matrix
 # - linter, eastwood and cljfmt
 
-tags_filter: &tags_filter
-  tags:
-    only: /^v\d+\.\d+\.\d+(-alpha\d*)?(-beta\d*)?$/
+run_always: &run_always
+  filters:
+    branches:
+      only: /.*/
+    tags:
+      only: /.*/
 
 workflows:
   version: 2.1
@@ -168,29 +170,9 @@ workflows:
             alias: "test"
             parameters:
               clojure_version: ["1.10", "1.11", "1.12"]
-              jdk_version: [jdk8, jdk11, jdk17, jdk23]
-          filters:
-            branches:
-              only: /.*/
-            <<: *tags_filter
-      - test:
-          # We have source for JDK21, so with this JDK version we also perform
-          # Java parser tests.
-          matrix:
-            alias: "test_with_sources"
-            parameters:
-              clojure_version: ["1.10", "1.11", "1.12"]
-              jdk_version: [jdk21]
-          filters:
-            branches:
-              only: /.*/
-            <<: *tags_filter
-      - util_job:
-          name: Code Linting
-          filters:
-            branches:
-              only: /.*/
-            <<: *tags_filter
+              jdk_version: [jdk8, jdk11, jdk17, jdk21, jdk23]
+          <<: *run_always
+      - lint:
           steps:
             - run:
                 name: Running cljfmt
@@ -205,12 +187,13 @@ workflows:
                 name: Running Eastwood
                 command: |
                   make eastwood
+          <<: *run_always
       - deploy:
           requires:
-            - "test"
-            - "test_with_sources"
-            - "Code Linting"
+            - test
+            - lint
           filters:
             branches:
               ignore: /.*/
-            <<: *tags_filter
+            tags:
+              only: /^v\d+\.\d+\.\d+(-alpha\d+)?$/

.clj-kondo/config.edn

@@ -24,4 +24,4 @@
            :type-mismatch         {:level :off}
            :unresolved-namespace  {:exclude [clojure.main nrepl.transport js]}}
  :output  {:progress      true
-           :exclude-files ["data_readers" "tasks" "base-src.zip"]}}
+           :exclude-files ["data_readers" "tasks"]}}

Makefile

@@ -1,35 +1,35 @@
-.PHONY: test quick-test eastwood cljfmt cljfmt-fix install fast-install smoketest deploy clean detect_timeout lein-repl repl lint light-kondo docs test_impl
+.PHONY: test quick-test eastwood cljfmt cljfmt-fix install fast-install smoketest deploy clean detect_timeout lint light-kondo docs test_impl
 .DEFAULT_GOAL := quick-test
 
-CLOJURE_VERSION ?= 1.11
-
-# The Lein profiles that will be selected for `lein-repl`.
-# Feel free to upgrade this, or to override it with an env var named LEIN_PROFILES.
-# Expected format: "+dev,+test"
-# Don't use spaces here.
-LEIN_PROFILES ?= "+dev,+test"
-
-TEST_PROFILES ?= "-user,-dev,+test"
-
-# The enrich-classpath version to be injected.
-# Feel free to upgrade this.
-ENRICH_CLASSPATH_VERSION="1.18.2"
-
 # Set bash instead of sh for the @if [[ conditions,
 # and use the usual safety flags:
 SHELL = /bin/bash -Ee
 
+CLOJURE_VERSION ?= 1.12
+TEST_PROFILES ?= "-user,-dev,+test"
+
 # We need Java sources to test Java parsing functionality, but the Docker images
 # we use on CircleCI doesn't include src.zip. So we have to download them from
 # Github and repackage in a form that is resemblant to src.zip from normal
 # distributions.
-base-src.zip:
-	wget https://github.com/adoptium/jdk21u/archive/refs/tags/jdk-21.0.5+3.zip -O full-src.zip
-	unzip -q full-src.zip
-	cp -r jdk21u-*/src/java.base/share/classes java.base
-	cp -r jdk21u-*/src/java.desktop/share/classes java.desktop
-	zip -qr base-src.zip java.base java.desktop
-	rm -rf java.base java.desktop jdk21u-* full-src.zip
+base-src-jdk8.zip:
+	# echo 'Placeholder. We dont parse sources on JDK8.'
+	touch $@
+
+base-src-jdk11.zip:
+	bash download-jdk-sources.sh https://github.com/adoptium/jdk11u/archive/refs/tags/jdk-11.0.25+9.zip jdk11 $@
+
+base-src-jdk17.zip:
+	bash download-jdk-sources.sh https://github.com/adoptium/jdk17u/archive/refs/tags/jdk-17.0.13+11.zip jdk17 $@
+
+base-src-jdk21.zip:
+	bash download-jdk-sources.sh https://github.com/adoptium/jdk21u/archive/refs/tags/jdk-21.0.5+3.zip jdk21 $@
+
+base-src-jdk23.zip:
+	bash download-jdk-sources.sh https://github.com/adoptium/jdk23u/archive/refs/tags/jdk-23.0.1+11.zip jdk23 $@
+
+copy-sources-to-jdk: base-src-$(JDK_SRC_VERSION).zip
+	mkdir -p $(JAVA_HOME)/lib && cp base-src-$(JDK_SRC_VERSION).zip $(JAVA_HOME)/lib/src.zip
 
 dump-version:
 	echo '"$(PROJECT_VERSION)"' > resources/cider/nrepl/version.edn
@@ -39,7 +39,7 @@ target/srcdeps: project.clj
 # Remove cljfmt.main because it depends on tools.cli which we explicitly removed.
 	rm -f target/srcdeps/cider/nrepl/inlined/deps/cljfmt/*/cljfmt/main.clj
 
-test_impl: base-src.zip
+test_impl: copy-sources-to-jdk
 		lein with-profile $(TEST_PROFILES),+$(CLOJURE_VERSION) test
 
 test: target/srcdeps
@@ -115,22 +115,5 @@ clean:
 	lein with-profile -user clean
 	cd test/smoketest && lein with-profile -user clean
 
-# Create and cache a `java` command. project.clj is mandatory; the others are optional but are taken into account for cache recomputation.
-# It's important not to silence with step with @ syntax, so that Enrich progress can be seen as it resolves dependencies.
-.enrich-classpath-lein-repl: Makefile project.clj $(wildcard checkouts/*/project.clj) $(wildcard deps.edn) $(wildcard $(HOME)/.clojure/deps.edn) $(wildcard profiles.clj) $(wildcard $(HOME)/.lein/profiles.clj) $(wildcard $(HOME)/.lein/profiles.d) $(wildcard /etc/leiningen/profiles.clj)
-	bash 'lein' 'update-in' ':plugins' 'conj' "[mx.cider/lein-enrich-classpath \"$(ENRICH_CLASSPATH_VERSION)\"]" '--' 'with-profile' $(LEIN_PROFILES) 'update-in' ':middleware' 'conj' 'cider.enrich-classpath.plugin-v2/middleware' '--' 'repl' | grep " -cp " > $@
-
-# Launches a repl, falling back to vanilla lein repl if something went wrong during classpath calculation.
-lein-repl: .enrich-classpath-lein-repl
-	@if grep --silent " -cp " .enrich-classpath-lein-repl; then \
-		export YOURKIT_SESSION_NAME="$(basename $(PWD))"; \
-		eval "$$(cat .enrich-classpath-lein-repl) --interactive"; \
-	else \
-		echo "Falling back to lein repl... (you can avoid further falling back by removing .enrich-classpath-lein-repl)"; \
-		lein with-profiles $(LEIN_PROFILES) repl; \
-	fi
-
-repl: lein-repl
-
 docs:
 	lein docs

README.md

@@ -62,15 +62,12 @@ guidelines](.github/CONTRIBUTING.md).
 
 ### Local development
 
-Local development tasks, like firing up a repl, running the tests or locally installing cider-nrepl are offered by our Makefile.
+Local development tasks, like running the tests or locally installing cider-nrepl are offered by our Makefile.
 We recommend using it, since some aspects can be intricate to newcomers.
 
 These are its main tasks for local development:
 
 ```
-# Fire up a repl and nrepl server you can cider-connect to:
-make repl
-
 # Run tests, using mranderson (slower but more realistic)
 make test
 

download-jdk-sources.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+URL="$1"
+QUALIFIER=$2
+DEST=$3
+
+# Download JDK sources from Github and repackage in the same fashion as src.zip
+# that is normally distributed with JDK.
+wget "$URL" -O full-src.zip
+unzip -q full-src.zip
+cp -r "$QUALIFIER"u-*/src/java.base/share/classes java.base
+cp -r "$QUALIFIER"u-*/src/java.desktop/share/classes java.desktop
+zip -qr $DEST java.base java.desktop
+rm -rf java.base java.desktop "$QUALIFIER"u- full-src.zip

project.clj

@@ -1,29 +1,4 @@
 (def fipp-version "0.6.26")
-(def jdk8? (= (System/getProperty "java.specification.version") "1.8"))
-(def jdk21? (= (System/getProperty "java.specification.version") "21"))
-
-;; Needed to be added onto classpath to test Java parser functionality.
-(def jdk-21-sources-archive
-  (delay
-    (let [src-zip (clojure.java.io/file "base-src.zip")]
-      (if (.exists src-zip)
-        (do (println "Found JDK sources:" src-zip)
-            [src-zip])
-        (do (println "base-src.zip not found. Run `make base-src.zip` to properly run all the tests.")
-            nil)))))
-
-;; Needed to run tests on JDK8.
-(def tools-jar
-  (delay
-    (let [java-home (System/getProperty "java.home")
-          tools-jar-paths [(clojure.java.io/file java-home "tools.jar")
-                           (clojure.java.io/file java-home "lib" "tools.jar")
-                           (clojure.java.io/file java-home ".." "tools.jar")
-                           (clojure.java.io/file java-home ".." "lib" "tools.jar")]
-          tools-jar (some #(when (.exists %) %) tools-jar-paths)]
-      (assert tools-jar (str "tools.jar was not found in " java-home))
-      (println "Found tools.jar:" tools-jar)
-      (str tools-jar))))
 
 (def dev-test-common-profile
   {:dependencies '[[org.clojure/clojurescript "1.11.60" :scope "provided"]
@@ -32,12 +7,7 @@
                    [org.clojure/test.check "1.1.1"]
                    [cider/piggieback "0.6.0"]
                    [nubank/matcher-combinators "3.9.1"]]
-   :source-paths (cond-> ["test/src"]
-                   ;; We only include sources with JDK21 because we only
-                   ;; repackage sources for that JDK. Sources from one JDK are
-                   ;; not compatible with other JDK for our test purposes.
-                   jdk21? (into @jdk-21-sources-archive)
-                   jdk8? (conj @tools-jar))
+   :source-paths ["test/src"]
    :global-vars {'*assert* true}
    :java-source-paths ["test/java"]
    :jvm-opts ["-Djava.util.logging.config.file=test/resources/logging.properties"]