Skip to content

Commit 98781b1

Browse files
authored
ci: fix downloading deps for windows (#253)
* ci: fix downloading deps for windows The `download-deps` bb task creates a basis for each deps.edn alias in-process to efficiently download all deps (work is done in build.clj). Because the `:build` alias also included `deps-deploy` its many deps were brought in. This seems to somehow mess up bringing down conflicting(?) deps for other aliases, at least for Windows. I've separated out `deps-deploy` to `:deploy` from `:build` alias to try to avoid the issue. Also: switched to `clojure.tools.build.api/create-basis`, was using `clojure.tools.deps/create-basis`; no need to use deps ns when build api exposes this fn. Also: was depending on stale `org.clojure/tools.build` maven dep, switched to current `io.github.clojure/tools.build` dep and updated to current version. Closes #252 * ci: bump setup-clojure This should fix GitHub API rate limit errors.
1 parent 08b7064 commit 98781b1

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

.github/workflows/libs-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
## instead of using lein bundled with github actions image.
5656
## Upcoming 2.11.2 might fix, can optionally revisit in the future.
5757
- name: Install Lein
58-
uses: DeLaGuardo/setup-clojure@12.4
58+
uses: DeLaGuardo/setup-clojure@12.5
5959
with:
6060
lein: 2.10.0
6161

.github/workflows/shared-setup/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ runs:
4040
if: inputs.jdk != 'skip'
4141

4242
- name: Install Babashka
43-
uses: DeLaGuardo/setup-clojure@12.4
43+
uses: DeLaGuardo/setup-clojure@12.5
4444
with:
4545
bb: 'latest'
4646

@@ -54,7 +54,7 @@ runs:
5454
if: runner.os == 'Windows'
5555

5656
- name: Install Clojure (macos, linux)
57-
uses: DeLaGuardo/setup-clojure@12.4
57+
uses: DeLaGuardo/setup-clojure@12.5
5858
with:
5959
cli: 'latest'
6060
if: runner.os != 'Windows'

build.clj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
(ns build
22
(:require [build-shared]
33
[clojure.edn :as edn]
4-
[clojure.tools.build.api :as b]
5-
[clojure.tools.deps :as deps]))
4+
[clojure.tools.build.api :as b]))
65

76
(def version (build-shared/lib-version))
87
(def lib (build-shared/lib-artifact-name))
@@ -61,7 +60,7 @@
6160
keys)]
6261
;; one at a time because aliases with :replace-deps will... well... you know.
6362
(println "Bring down default deps")
64-
(deps/create-basis {})
63+
(b/create-basis {})
6564
(doseq [a (sort aliases)]
6665
(println "Bring down deps for alias" a)
67-
(deps/create-basis {:aliases [a]}))))
66+
(b/create-basis {:aliases [a]}))))

deps.edn

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,14 @@
136136
;;
137137
;; Deployment
138138
;;
139-
:build {:deps {org.clojure/tools.build {:mvn/version "0.9.2"}
140-
slipset/deps-deploy {:mvn/version "0.2.2"}}
139+
:build {:deps {io.github.clojure/tools.build {:mvn/version "0.9.6"}}
141140
:extra-paths ["src" "build"]
142141
:ns-default build}
143142

143+
;; keep deploy deps separate from build deps; this avoids `bb download-deps` failures on windows
144+
;; when downloading jackson (and other conflicting) deps.
145+
:deploy {:extra-deps {slipset/deps-deploy {:mvn/version "0.2.2"}}}
146+
144147
;;
145148
;; Maintenance support
146149
;;

script/ci_publish.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
(defn clojars-deploy []
4242
(assert-on-ci)
4343
(analyze-ci-tag) ;; fail on unexpected version tag
44-
(t/shell "clojure -T:build deploy"))
44+
(t/shell "clojure -T:build:deploy deploy"))
4545

4646
(defn github-create-release []
4747
(assert-on-ci)

0 commit comments

Comments
 (0)