Skip to content

Commit 51997d1

Browse files
committed
Rework build pipeline
1 parent fa55aa9 commit 51997d1

File tree

3 files changed

+24
-17
lines changed

3 files changed

+24
-17
lines changed

.github/workflows/release.yaml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,17 @@ jobs:
88
VERSION: ${{ github.ref_name }}
99
steps:
1010
- name: Checkout git repo
11-
uses: actions/checkout@v3
11+
uses: actions/checkout@v4
1212

13-
- uses: actions/setup-java@v2
13+
- uses: actions/setup-java@v4
1414
with:
15-
distribution: 'temurin'
16-
java-version: '21'
15+
distribution: temurin
16+
java-version: 21
17+
cache: 'maven'
18+
cache-dependency-path: 'deps.edn'
1719

18-
- uses: extractions/setup-just@v1
19-
20-
- uses: DeLaGuardo/[email protected]
20+
- uses: extractions/setup-just@v2
21+
- uses: DeLaGuardo/[email protected]
2122
with:
2223
cli: latest
2324

build.clj renamed to build/build.clj

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
(:require
33
[clojure.string :as str]
44
[clojure.tools.build.api :as b]
5-
[deps-deploy.deps-deploy :as deps-deploy]))
5+
[k16.kaven.deploy :as kaven.deploy]))
66

77
(def basis (delay (b/create-basis {})))
88

@@ -35,8 +35,13 @@
3535
(b/jar {:class-dir class-dir
3636
:jar-file jar-file}))
3737

38+
(def ^:private clojars-credentials
39+
{:username (System/getenv "CLOJARS_USERNAME")
40+
:password (System/getenv "CLOJARS_PASSWORD")})
41+
3842
(defn release [_]
39-
(deps-deploy/deploy {:installer :remote
40-
:artifact (b/resolve-path jar-file)
41-
:pom-file (b/pom-path {:lib lib
42-
:class-dir class-dir})}))
43+
(kaven.deploy/deploy
44+
{:jar-path (b/resolve-path jar-file)
45+
:repository {:id "clojars"
46+
:credentials clojars-credentials}}))
47+

deps.edn

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{:paths ["clojure"]
2-
:deps {metosin/jsonista {:mvn/version "0.3.8"}
3-
org.clj-commons/pretty {:mvn/version "3.0.0"}}
42

5-
:aliases {:build {:extra-deps {io.github.clojure/tools.build {:mvn/version "0.9.6"}
6-
slipset/deps-deploy {:mvn/version "0.2.2"}}
7-
:extra-paths ["./build.clj"]
3+
:deps {metosin/jsonista {:mvn/version "0.3.13"}
4+
org.clj-commons/pretty {:mvn/version "3.3.2"}}
5+
6+
:aliases {:build {:extra-deps {io.github.clojure/tools.build {:mvn/version "0.10.9"}
7+
com.kepler16/kaven {:mvn/version "1.0.0-alpha.1"}}
8+
:extra-paths ["./build"]
89
:ns-default build}}}

0 commit comments

Comments
 (0)