Last batch of deploy tweaks/fixes (#362)

* Fix typo in deploy setup

* Add an assert

* Also lint deploy script

* Fail more informatively

* Dissoc CLASSPATH

* Add changelog entry

Author: vemv

.circleci/config.yml

@@ -143,7 +143,7 @@ jobs:
       - run:
          name: Deploy
          command: |
-           lein with-profile -user,+deploy run -m deploy-relase make deploy
+           lein with-profile -user,+deploy run -m deploy-release make deploy
 
   test_code:
     description: |

.circleci/deploy/deploy_release.clj

@@ -16,15 +16,22 @@
 (defn -main [& _]
   (let [tag (System/getenv "CIRCLE_TAG")]
     (if-not tag
-      (System/exit 1)
+      (do
+        (println "No CIRCLE_TAG found.")
+        (System/exit 1))
       (if-not (re-find (re-pattern release-marker) tag)
-        (System/exit 1)
-        (let [version (make-version tag)]
-          (spit (io/file "resources" "refactor_nrepl" "version.edn")
-                (pr-str version))
+        (do
+          (println (format "The `%s` marker was not found in %s." release-marker tag))
+          (System/exit 1))
+        (let [version (make-version tag)
+              version-file (io/file "resources" "refactor_nrepl" "version.edn")]
+          (assert (.exists version-file))
+          (spit version-file (pr-str version))
           (apply println "Executing" *command-line-args*)
-          (->> [:env (assoc (into {} (System/getenv))
-                            "PROJECT_VERSION" (make-version tag))]
+          (->> [:env (-> {}
+                         (into (System/getenv))
+                         (assoc "PROJECT_VERSION" (make-version tag))
+                         (dissoc "CLASSPATH"))]
                (into (vec *command-line-args*))
                (apply sh)
                log-result

CHANGELOG.md

@@ -2,7 +2,11 @@
 
 ## Unreleased
 
-## 3.2.1 (2022-01-21)
+## 3.2.2 (2022-01-29)
+
+* Fix a minor artifact in the previous release (the version would be reported as 0.0.0).
+
+## 3.2.1 (2022-01-29)
 
 * Upgrade Orchard.
 

Makefile

@@ -25,7 +25,7 @@ cljfmt-fix:
 	lein with-profile -user,+$(VERSION),+cljfmt cljfmt fix
 
 eastwood:
-	lein with-profile -user,+$(VERSION),+eastwood eastwood
+	lein with-profile -user,+$(VERSION),+deploy,+eastwood eastwood
 
 kondo:
 	lein with-profile -dev,+$(VERSION),+clj-kondo run -m clj-kondo.main --lint src test