Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: fix downloading deps for windows #253

Merged
merged 2 commits into from
Feb 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/libs-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
## instead of using lein bundled with github actions image.
## Upcoming 2.11.2 might fix, can optionally revisit in the future.
- name: Install Lein
uses: DeLaGuardo/setup-clojure@12.4
uses: DeLaGuardo/setup-clojure@12.5
with:
lein: 2.10.0

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/shared-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ runs:
if: inputs.jdk != 'skip'

- name: Install Babashka
uses: DeLaGuardo/setup-clojure@12.4
uses: DeLaGuardo/setup-clojure@12.5
with:
bb: 'latest'

Expand All @@ -54,7 +54,7 @@ runs:
if: runner.os == 'Windows'

- name: Install Clojure (macos, linux)
uses: DeLaGuardo/setup-clojure@12.4
uses: DeLaGuardo/setup-clojure@12.5
with:
cli: 'latest'
if: runner.os != 'Windows'
Expand Down
7 changes: 3 additions & 4 deletions build.clj
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
(ns build
(:require [build-shared]
[clojure.edn :as edn]
[clojure.tools.build.api :as b]
[clojure.tools.deps :as deps]))
[clojure.tools.build.api :as b]))

(def version (build-shared/lib-version))
(def lib (build-shared/lib-artifact-name))
Expand Down Expand Up @@ -61,7 +60,7 @@
keys)]
;; one at a time because aliases with :replace-deps will... well... you know.
(println "Bring down default deps")
(deps/create-basis {})
(b/create-basis {})
(doseq [a (sort aliases)]
(println "Bring down deps for alias" a)
(deps/create-basis {:aliases [a]}))))
(b/create-basis {:aliases [a]}))))
7 changes: 5 additions & 2 deletions deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,14 @@
;;
;; Deployment
;;
:build {:deps {org.clojure/tools.build {:mvn/version "0.9.2"}
slipset/deps-deploy {:mvn/version "0.2.2"}}
:build {:deps {io.github.clojure/tools.build {:mvn/version "0.9.6"}}
:extra-paths ["src" "build"]
:ns-default build}

;; keep deploy deps separate from build deps; this avoids `bb download-deps` failures on windows
;; when downloading jackson (and other conflicting) deps.
:deploy {:extra-deps {slipset/deps-deploy {:mvn/version "0.2.2"}}}

;;
;; Maintenance support
;;
Expand Down
2 changes: 1 addition & 1 deletion script/ci_publish.clj
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
(defn clojars-deploy []
(assert-on-ci)
(analyze-ci-tag) ;; fail on unexpected version tag
(t/shell "clojure -T:build deploy"))
(t/shell "clojure -T:build:deploy deploy"))

(defn github-create-release []
(assert-on-ci)
Expand Down