From 1d15fddfda93280c7189e04d909570abab79e3f9 Mon Sep 17 00:00:00 2001 From: Lee Read Date: Mon, 29 Jul 2024 18:05:54 -0400 Subject: [PATCH] test & ci: bump deps, tweak pubcheck (#301) Of note: - clojure 1.12 beta2! - bb `pubcheck` task can now run checks on unpushed branch --- deps.edn | 4 +-- package-lock.json | 83 ++++++++++++++++++++++++---------------------- package.json | 4 +-- script/publish.clj | 11 +++--- 4 files changed, 54 insertions(+), 48 deletions(-) diff --git a/deps.edn b/deps.edn index a136120..b52f54e 100644 --- a/deps.edn +++ b/deps.edn @@ -19,7 +19,7 @@ :1.11 {:override-deps {org.clojure/clojure {:mvn/version "1.11.3"}}} ;; Clojure pre-release to test against - :1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.0-beta1"}}} + :1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.0-beta2"}}} ;; ;; ClojureScript version we test with (and support) @@ -31,7 +31,7 @@ ;; :nrepl {:extra-deps {nrepl/nrepl {:mvn/version "1.2.0"} - cider/cider-nrepl {:mvn/version "0.49.1"}} + cider/cider-nrepl {:mvn/version "0.49.2"}} :jvm-opts ["-XX:-OmitStackTraceInFastThrow"]} :nrepl/jvm diff --git a/package-lock.json b/package-lock.json index 4413a71..c5bb70d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,12 +6,12 @@ "": { "name": "rewrite-clj", "devDependencies": { - "karma": "^6.4.3", + "karma": "^6.4.4", "karma-chrome-launcher": "^3.2.0", "karma-cljs-test": "^0.1.0", "karma-junit-reporter": "^2.0.0", "karma-spec-reporter": "^0.0.36", - "shadow-cljs": "^2.28.10" + "shadow-cljs": "^2.28.11" } }, "node_modules/@colors/colors": { @@ -45,12 +45,12 @@ } }, "node_modules/@types/node": { - "version": "20.14.10", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.10.tgz", - "integrity": "sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==", + "version": "22.0.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.0.0.tgz", + "integrity": "sha512-VT7KSYudcPOzP5Q0wfbowyNLaVR8QWUdw+088uFWwfvpY6uCWaXpqV6ieLAu9WBcnTa7H4Z5RLK8I5t2FuOcqw==", "dev": true, "dependencies": { - "undici-types": "~5.26.4" + "undici-types": "~6.11.1" } }, "node_modules/accepts": { @@ -724,9 +724,9 @@ "dev": true }, "node_modules/elliptic": { - "version": "6.5.5", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.5.tgz", - "integrity": "sha512-7EjbcmUm17NQFu4Pmgmq2olYMj8nwMnpcddByChSUjArp8F5DQWcIcpriwO4ZToLNAJig0yiyjswfyGNje/ixw==", + "version": "6.5.6", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.6.tgz", + "integrity": "sha512-mpzdtpeCLuS3BmE3pO3Cpp5bbjlOPY2Q0PgoF+Od1XZrHLYI28Xe3ossCmYCQt11FQKEYd9+PF8jymTvtWJSHQ==", "dev": true, "dependencies": { "bn.js": "^4.11.9", @@ -790,9 +790,9 @@ } }, "node_modules/engine.io/node_modules/debug": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz", - "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", "dev": true, "dependencies": { "ms": "2.1.2" @@ -1363,9 +1363,9 @@ } }, "node_modules/karma": { - "version": "6.4.3", - "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.3.tgz", - "integrity": "sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q==", + "version": "6.4.4", + "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.4.tgz", + "integrity": "sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==", "dev": true, "dependencies": { "@colors/colors": "1.5.0", @@ -1466,9 +1466,9 @@ } }, "node_modules/log4js/node_modules/debug": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz", - "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", "dev": true, "dependencies": { "ms": "2.1.2" @@ -2094,9 +2094,9 @@ } }, "node_modules/shadow-cljs": { - "version": "2.28.10", - "resolved": "https://registry.npmjs.org/shadow-cljs/-/shadow-cljs-2.28.10.tgz", - "integrity": "sha512-EVCJLKUqqM12N16BrjxObWeV8Rs2UauHxXs0sPqyIf5P9AbjdHE4oPFRsdD/O8NTDl6M8/oim4tPtiHhu2d6jg==", + "version": "2.28.11", + "resolved": "https://registry.npmjs.org/shadow-cljs/-/shadow-cljs-2.28.11.tgz", + "integrity": "sha512-4Rg73Ga7w1+rDIYJ2gRChJv8b2/SQvL/riMGmruJ2BaQbHIFhqMdwZj5tYXTRyrbzBuKiHsOemg06kXzipredA==", "dev": true, "dependencies": { "node-libs-browser": "^2.2.1", @@ -2166,9 +2166,9 @@ } }, "node_modules/socket.io-adapter/node_modules/debug": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz", - "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", "dev": true, "dependencies": { "ms": "2.1.2" @@ -2223,9 +2223,9 @@ } }, "node_modules/socket.io-parser/node_modules/debug": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz", - "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", "dev": true, "dependencies": { "ms": "2.1.2" @@ -2246,9 +2246,9 @@ "dev": true }, "node_modules/socket.io/node_modules/debug": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz", - "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", "dev": true, "dependencies": { "ms": "2.1.2" @@ -2342,9 +2342,9 @@ } }, "node_modules/streamroller/node_modules/debug": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz", - "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", "dev": true, "dependencies": { "ms": "2.1.2" @@ -2490,9 +2490,9 @@ } }, "node_modules/undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "version": "6.11.1", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.11.1.tgz", + "integrity": "sha512-mIDEX2ek50x0OlRgxryxsenE5XaQD4on5U2inY7RApK3SOJpofyw7uW2AyfMKkhAxXIceo2DeWGVGwyvng1GNQ==", "dev": true }, "node_modules/universalify": { @@ -2514,13 +2514,16 @@ } }, "node_modules/url": { - "version": "0.11.3", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.3.tgz", - "integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==", + "version": "0.11.4", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.4.tgz", + "integrity": "sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==", "dev": true, "dependencies": { "punycode": "^1.4.1", - "qs": "^6.11.2" + "qs": "^6.12.3" + }, + "engines": { + "node": ">= 0.4" } }, "node_modules/url/node_modules/qs": { diff --git a/package.json b/package.json index f34c53b..2c440ec 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "name": "rewrite-clj", "devDependencies": { - "karma": "^6.4.3", + "karma": "^6.4.4", "karma-chrome-launcher": "^3.2.0", "karma-cljs-test": "^0.1.0", "karma-junit-reporter": "^2.0.0", "karma-spec-reporter": "^0.0.36", - "shadow-cljs": "^2.28.10" + "shadow-cljs": "^2.28.11" } } diff --git a/script/publish.clj b/script/publish.clj index 6c66228..ab63723 100644 --- a/script/publish.clj +++ b/script/publish.clj @@ -60,12 +60,15 @@ string/trim seq)) +(defn- local-branch? [] + (let [{:keys [exit]} (t/shell {:continue true :out :string :err :out} + "git rev-parse --symbolic-full-name @{u}")] + (not (zero? exit)))) + (defn- unpushed-commits? [] (let [{:keys [exit :out]} (t/shell {:continue true :out :string} "git cherry -v")] - (if (zero? exit) - (-> out string/trim seq) - (status/die 1 "Failed to check for unpushed commits, are you on an unpushed branch?")))) + (and (zero? exit) (-> out string/trim seq)))) (defn- commit-matches-default-head? [] (let [repo-head-sha (-> (t/shell {:out :string} (format "git ls-remote https://github.com/%s.git main" (build-shared/lib-github-coords))) @@ -106,7 +109,7 @@ {:check "no uncommitted code" :result (if (uncommitted-code?) :fail :pass)} {:check "no unpushed commits" - :result (if (unpushed-commits?) :fail :pass)} + :result (if (or (local-branch?) (unpushed-commits?)) :fail :pass)} {:check "in synch with project repo HEAD" :result (if (commit-matches-default-head?) :pass :fail)} {:check "changelog has unreleased section"