diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml new file mode 100644 index 0000000..e14099c --- /dev/null +++ b/.github/workflows/test-and-release.yml @@ -0,0 +1,36 @@ +name: Clojure CI + +on: + push: + tags: + - "v*" + +jobs: + build-and-release: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v2 + with: + distribution: 'adopt' + java-version: '11' + - name: Setup Clojure + uses: DeLaGuardo/setup-clojure@master + with: + tools-deps: '1.10.3.986' + - name: Cache All The Things + uses: actions/cache@v2 + with: + path: | + ~/.m2/repository + ~/.gitlibs + ~/.clojure + ~/.cpcache + key: ${{ runner.os }}-${{ hashFiles('**/deps.edn') }} + - name: Run Tests + run: clojure -T:build ci :snapshot false + - name: Deploy Release + run: clojure -T:build deploy :snapshot false + env: + CLOJARS_PASSWORD: ${{secrets.DEPLOY_TOKEN}} + CLOJARS_USERNAME: ${{secrets.DEPLOY_USERNAME}} diff --git a/.github/workflows/test-and-snapshot.yml b/.github/workflows/test-and-snapshot.yml index 0e1baa7..22036ff 100644 --- a/.github/workflows/test-and-snapshot.yml +++ b/.github/workflows/test-and-snapshot.yml @@ -1,6 +1,9 @@ name: Clojure CI -on: [push] +on: + push: + branches: + - "develop" jobs: build-and-snapshot: diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d79887..cf2d356 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,10 @@ Only accretive/fixative changes will be made from now on. -* 1.2.next in progress +* 1.2.752 -- 2021-11-17 * Address #187 by adding `clj-kondo.exports` for future expansion (`with-transaction` is already built into `clj-kondo`). * Documentation updates; `pom.xml` template cleanup. + * Update `build-clj` to v0.5.4. * 1.2.737 -- 2021-10-17 * Address #186 by updating `java.data` to 1.0.92 and documenting HikariCP's `:dataSourceProperties`. diff --git a/README.md b/README.md index 100a0e2..22e3d5d 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ The next generation of `clojure.java.jdbc`: a new low-level Clojure wrapper for The latest versions on Clojars and on cljdoc: -[![Clojars Project](https://clojars.org/com.github.seancorfield/next.jdbc/latest-version.svg)](https://clojars.org/com.github.seancorfield/next.jdbc) [![cljdoc badge](https://cljdoc.org/badge/com.github.seancorfield/next.jdbc?1.2.737)](https://cljdoc.org/d/com.github.seancorfield/next.jdbc/CURRENT) +[![Clojars Project](https://clojars.org/com.github.seancorfield/next.jdbc/latest-version.svg)](https://clojars.org/com.github.seancorfield/next.jdbc) [![cljdoc badge](https://cljdoc.org/badge/com.github.seancorfield/next.jdbc?1.2.752)](https://cljdoc.org/d/com.github.seancorfield/next.jdbc/CURRENT) The documentation on [cljdoc.org](https://cljdoc.org/d/com.github.seancorfield/next.jdbc/CURRENT) is for the current version of `next.jdbc`: @@ -17,7 +17,7 @@ The documentation on [cljdoc.org](https://cljdoc.org/d/com.github.seancorfield/n * [Migrating from `clojure.java.jdbc`](https://cljdoc.org/d/com.github.seancorfield/next.jdbc/CURRENT/doc/migration-from-clojure-java-jdbc) * Feedback via [issues](https://github.com/seancorfield/next-jdbc/issues) or in the [`#sql` channel on the Clojurians Slack](https://clojurians.slack.com/messages/C1Q164V29/) or the [`#sql` stream on the Clojurians Zulip](https://clojurians.zulipchat.com/#narrow/stream/152063-sql). -The documentation on GitHub is for **develop** since the 1.2.737 release -- [see the CHANGELOG](https://github.com/seancorfield/next-jdbc/blob/develop/CHANGELOG.md) and then read the [corresponding updated documentation](https://github.com/seancorfield/next-jdbc/tree/develop/doc) on GitHub if you want. Older versions of `next.jdbc` were published under the `seancorfield` group ID and you can find [older seancorfield/next.jdbc documentation on cljdoc.org](https://cljdoc.org/versions/seancorfield/next.jdbc). +The documentation on GitHub is for **develop** since the 1.2.752 release -- [see the CHANGELOG](https://github.com/seancorfield/next-jdbc/blob/develop/CHANGELOG.md) and then read the [corresponding updated documentation](https://github.com/seancorfield/next-jdbc/tree/develop/doc) on GitHub if you want. Older versions of `next.jdbc` were published under the `seancorfield` group ID and you can find [older seancorfield/next.jdbc documentation on cljdoc.org](https://cljdoc.org/versions/seancorfield/next.jdbc). This project follows the version scheme MAJOR.MINOR.COMMITS where MAJOR and MINOR provide some relative indication of the size of the change, but do not follow semantic versioning. In general, all changes endeavor to be non-breaking (by moving to new names rather than by breaking existing names). COMMITS is an ever-increasing counter of commits since the beginning of this repository. diff --git a/deps.edn b/deps.edn index bdbbdad..43e13aa 100644 --- a/deps.edn +++ b/deps.edn @@ -7,7 +7,7 @@ :aliases {;; for help: clojure -A:deps -T:build help/doc :build {:deps {io.github.seancorfield/build-clj - {:git/tag "v0.5.2" :git/sha "8f75b81"}} + {:git/tag "v0.5.4" :git/sha "bc9c0cc"}} :ns-default build} ;; versions to test against: diff --git a/doc/getting-started.md b/doc/getting-started.md index d4d2ee9..df9832c 100644 --- a/doc/getting-started.md +++ b/doc/getting-started.md @@ -11,12 +11,12 @@ It is designed to work with Clojure 1.10 or later, supports `datafy`/`nav`, and You can add `next.jdbc` to your project with either: ```clojure -com.github.seancorfield/next.jdbc {:mvn/version "1.2.737"} +com.github.seancorfield/next.jdbc {:mvn/version "1.2.752"} ``` for `deps.edn` or: ```clojure -[com.github.seancorfield/next.jdbc "1.2.737"] +[com.github.seancorfield/next.jdbc "1.2.752"] ``` for `project.clj` or `build.boot`. @@ -37,7 +37,7 @@ For the examples in this documentation, we will use a local H2 database on disk, ```clojure ;; deps.edn {:deps {org.clojure/clojure {:mvn/version "1.10.3"} - com.github.seancorfield/next.jdbc {:mvn/version "1.2.737"} + com.github.seancorfield/next.jdbc {:mvn/version "1.2.752"} com.h2database/h2 {:mvn/version "1.4.199"}}} ```