Skip to content

Commit fb24dd5

Browse files
authored
Merge pull request #1197 from metosin/bump-deps
bump deps, ci setup for automatic releases
2 parents e2214b8 + 24f9fb7 commit fb24dd5

File tree

5 files changed

+57
-16
lines changed

5 files changed

+57
-16
lines changed

.github/workflows/clojure.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
with:
7070
cli: latest
7171
- name: Setup Node.js
72-
uses: actions/setup-node@v4.1.0
72+
uses: actions/setup-node@v4.4.0
7373
with:
7474
node-version: 16
7575
- name: Install dependencies

.github/workflows/release.yml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Release
2+
3+
on:
4+
push:
5+
branches:
6+
- release
7+
release:
8+
types:
9+
- published # reacts to releases and prereleases, but not their drafts
10+
11+
jobs:
12+
build-and-release:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v4
16+
- name: "Setup Java"
17+
uses: actions/setup-java@v4
18+
with:
19+
java-version: 8
20+
- name: "Setup Clojure"
21+
uses: DeLaGuardo/setup-clojure@master
22+
with:
23+
cli: latest
24+
- name: Build jar
25+
run: clojure -M:jar
26+
- name: Deploy to Clojars
27+
run: clojure -X:deploy
28+
env:
29+
CLOJARS_USER: metosinci
30+
CLOJARS_PASSWORD: "${{ secrets.CLOJARS_DEPLOY_TOKEN }}"

deps.edn

+12-10
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
{:paths ["src" "resources"]
22
:deps {org.clojure/clojure {:mvn/version "1.12.0"}
33
borkdude/dynaload {:mvn/version "0.3.5"}
4-
borkdude/edamame {:mvn/version "1.4.27"}
4+
borkdude/edamame {:mvn/version "1.4.30"}
55
org.clojure/test.check {:mvn/version "1.1.1"}
66
;; pretty errors, optional deps
77
fipp/fipp {:mvn/version "0.6.27"}
88
mvxcvi/arrangement {:mvn/version "2.1.0"}}
99
:aliases {:test {:extra-paths ["test"]
10-
:extra-deps {com.gfredericks/test.chuck {:mvn/version "0.2.14"}
10+
:extra-deps {com.gfredericks/test.chuck {:mvn/version "0.2.15"}
1111
lambdaisland/kaocha {:mvn/version "1.91.1392"}
1212
lambdaisland/kaocha-cljs {:mvn/version "1.5.154"}
13-
org.babashka/sci {:mvn/version "0.9.44"}
13+
org.babashka/sci {:mvn/version "0.9.45"}
1414
lambdaisland/kaocha-junit-xml {:mvn/version "1.17.101"}
1515
metosin/spec-tools {:mvn/version "0.10.7"}
1616
spec-provider/spec-provider {:mvn/version "0.4.14"}
1717
metosin/schema-tools {:mvn/version "0.13.1"}
18-
metosin/jsonista {:mvn/version "0.3.12"}
18+
metosin/jsonista {:mvn/version "0.3.13"}
1919
prismatic/schema {:mvn/version "1.4.1"}
2020
minimallist/minimallist {:mvn/version "0.0.10"}
2121
net.cgrand/seqexp {:mvn/version "0.6.2"}
22-
djblue/portal {:mvn/version "0.58.3"}
22+
djblue/portal {:mvn/version "0.59.1"}
2323
meta-merge/meta-merge {:mvn/version "1.0.0"}
2424
expound/expound {:mvn/version "0.9.0"}
2525
lambdaisland/deep-diff {:mvn/version "0.0-47"}
@@ -28,7 +28,7 @@
2828
:sha "4cbfa677c4cd66339f18e1c122222c05c69e0d8e"}}}
2929
:clojure-11 {:extra-deps {org.clojure/clojure {:mvn/version "1.11.3"}}}
3030
:clojure-12 {}
31-
:sci {:extra-deps {org.babashka/sci {:mvn/version "0.9.44"}}}
31+
:sci {:extra-deps {org.babashka/sci {:mvn/version "0.9.45"}}}
3232
:cherry {:extra-deps {io.github.squint-cljs/cherry {:git/sha "bccd994556efca378984c5ac7fd973bda164923b"}}}
3333
:test-sci {:extra-paths ["test-sci"]
3434
:main-opts ["-m" "cljs-test-runner.main" "-d" "test-sci" "-d" "test"]}
@@ -39,7 +39,7 @@
3939
com.widdindustries/cljs.java-time {:mvn/version "0.1.20"}}
4040
:extra-paths ["test" "cljs-test-runner-out/gen"]
4141
:main-opts ["-m" "cljs-test-runner.main" "-d" "test"]}
42-
:build {:deps {io.github.clojure/tools.build {:git/tag "v0.10.6" :git/sha "52cf7d6"}}
42+
:build {:deps {io.github.clojure/tools.build {:git/tag "v0.10.8" :git/sha "2fdfd66"}}
4343
:ns-default build}
4444
:jmh {:paths ["target/uber.jar" "classes"]
4545
:deps {jmh-clojure/jmh-clojure {:mvn/version "0.4.1"}
@@ -51,12 +51,14 @@
5151
org.clojure/tools.namespace #_:clj-kondo/ignore {:mvn/version "RELEASE"}}}
5252

5353
:shadow {:extra-paths ["app"]
54-
:extra-deps {thheller/shadow-cljs {:mvn/version "2.28.20"}
54+
:extra-deps {thheller/shadow-cljs {:mvn/version "3.0.5"}
5555
binaryage/devtools {:mvn/version "1.0.7"}}}
5656
:slow {:extra-deps {io.dominic/slow-namespace-clj
5757
{:git/url "https://git.sr.ht/~severeoverfl0w/slow-namespace-clj"
5858
:sha "f68d66d99d95f4d2bfd61f001e28a8ad7c4d3a12"}}
5959
:main-opts ["-m" "io.dominic.slow-namespace-clj.core"]}
60+
:outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "2.11.1276"}}
61+
:main-opts ["-m" "antq.core"]}
6062
:jar {:extra-deps {pack/pack.alpha
6163
{:git/url "https://github.com/juxt/pack.alpha.git"
6264
:sha "b093f79420fef019faf62a75b888b5e10f4e8cc9"}}
@@ -71,11 +73,11 @@
7173
"malli.jar"]}
7274
:graalvm {:extra-paths ["graal-test/src"]
7375
:extra-deps {org.clojure/clojure {:mvn/version "1.12.0"}
74-
org.babashka/sci {:mvn/version "0.9.44"}}}
76+
org.babashka/sci {:mvn/version "0.9.45"}}}
7577
:perf {:extra-paths ["perf"]
7678
:extra-deps {criterium/criterium {:mvn/version "0.4.6"}
7779
org.clojure/clojure {:mvn/version "1.12.0"}
78-
com.clojure-goes-fast/clj-async-profiler {:mvn/version "1.5.1"}}
80+
com.clojure-goes-fast/clj-async-profiler {:mvn/version "1.6.2"}}
7981
:jvm-opts ["-server"
8082
"-Xmx4096m"
8183
"-Dclojure.compiler.direct-linking=true"]}}}

docs/releasing.md

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Making a Malli release
2+
3+
1. Make sure `CHANGELOG.md` mentions all relevant unreleased changes
4+
2. Recommended: update dependencies `clj -M:outdated --upgrade`
5+
* Make a PR out of this to get the CI to run all the tests!
6+
3. Pick a new version number. Remember: we use [BreakVer](https://www.taoensso.com/break-versioning)
7+
4. Set the version number
8+
* Add a title to `CHANGELOG.md`
9+
* Change the `<version>` and `<tag>` fields in `pom.xml`
10+
5. Push to `master`
11+
6. Create a release via the [GitHub UI](https://github.com/metosin/malli/releases/new)
12+
* Use the version number as the tag name, eg. `0.22.33`
13+
7. Once the release is published, the `release` GitHub Action will build a release and deploy it to Clojars.

pom.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<dependency>
4242
<groupId>borkdude</groupId>
4343
<artifactId>edamame</artifactId>
44-
<version>1.4.27</version>
44+
<version>1.4.30</version>
4545
</dependency>
4646
<dependency>
4747
<groupId>org.clojure</groupId>
@@ -62,10 +62,6 @@
6262
<id>clojars</id>
6363
<url>https://repo.clojars.org/</url>
6464
</repository>
65-
<repository>
66-
<id>sonatype</id>
67-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
68-
</repository>
6965
</repositories>
7066
<distributionManagement>
7167
<repository>

0 commit comments

Comments
 (0)