diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 4f49daf..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,29 +0,0 @@ -version: 2 -jobs: - build: - working_directory: ~/honeysql - docker: - - image: circleci/clojure:openjdk-11-tools-deps-1.10.3.933 - steps: - - checkout - - restore_cache: - key: honeysql-{{ checksum "deps.edn" }} - - run: - name: Get rid of erroneous git config - command: rm -rf ~/.gitconfig - - run: - name: Install Node - command: sudo apt-get update && sudo apt-get install -y nodejs - - run: - name: Download Dependencies - # 1.9 is the default so we need to ask for 1.10 (1.11 is a snapshot we don't cache): - command: clojure -P -M:build:test:cljs:eastwood:readme && clojure -P -M:1.10 - - save_cache: - paths: - - ~/.m2 - - ~/.gitlibs - - ~/node_modules - key: honeysql-{{ checksum "deps.edn" }} - - run: - name: Run all the tests - command: clojure -T:build ci diff --git a/.github/workflows/test-and-snapshot.yml b/.github/workflows/test-and-snapshot.yml index e4f480a..083cb56 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/README.md b/README.md index dfb2d72..edaa691 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Honey SQL [![Clojure CI](https://github.com/seancorfield/honeysql/actions/workflows/test.yml/badge.svg)](https://github.com/seancorfield/honeysql/actions/workflows/test.yml) [![CircleCI](https://circleci.com/gh/seancorfield/honeysql/tree/develop.svg?style=svg)](https://circleci.com/gh/seancorfield/honeysql/tree/develop) [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/seancorfield/honeysql) +# Honey SQL [![Clojure CI](https://github.com/seancorfield/honeysql/actions/workflows/test.yml/badge.svg)](https://github.com/seancorfield/honeysql/actions/workflows/test.yml) [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/seancorfield/honeysql) SQL as Clojure data structures. Build queries programmatically -- even at runtime -- without having to bash strings together. diff --git a/deps.edn b/deps.edn index 54148e8..f197156 100644 --- a/deps.edn +++ b/deps.edn @@ -4,7 +4,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.5" :git/sha "0527130"}} :ns-default build} ;; versions to test against: