From ad39fc96dc1a3458cec3a937caf2cebaf6519e0c Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Thu, 20 Sep 2018 10:58:05 +0100 Subject: [PATCH 1/6] Preparing for test release --- CHANGELOG.md | 3 +++ project.clj | 3 +++ 2 files changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c469dda..1af348d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ All notable changes to this project will be documented in this file. This change ## [Unreleased] +## 0.1.4 - 2018-09-20 +This is not anticipated to be the actual Beta release; it's a dummy run to test the release and deployment process. Some required features are still missing. + ## 0.1.0 - 2018-06-17 ### Added Initial release. diff --git a/project.clj b/project.clj index b193d12..1cea1b9 100644 --- a/project.clj +++ b/project.clj @@ -13,6 +13,9 @@ :plugins [[lein-codox "0.10.4"] [lein-release "1.1.3"]] + :deploy-repositories [["releases" :clojars] + ["snapshots" :clojars]] + ;; `lein release` doesn't work with `git flow release`. To use ;; `lein release`, first merge `develop` into `master`, and then, in branch ;; `master`, run `lein release` From f9a120cf9401e8da93413b6dc0412bebd8c2e582 Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Thu, 20 Sep 2018 10:59:34 +0100 Subject: [PATCH 2/6] Ignore tar files --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index a4cb69a..3ae5f4b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ pom.xml.asc .lein-failures .nrepl-port .cpcache/ + +*.tar From 5e6a8a1298db5d6a3039f2f7a52314fa566a4ffb Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Thu, 20 Sep 2018 11:00:57 +0100 Subject: [PATCH 3/6] Added a file to ensure the pkg directory exists --- pkg/README | 1 + 1 file changed, 1 insertion(+) create mode 100644 pkg/README diff --git a/pkg/README b/pkg/README new file mode 100644 index 0000000..90f52ef --- /dev/null +++ b/pkg/README @@ -0,0 +1 @@ +this directory is required by the release process From fe84f237126df6af0ffd59665900b594ad719214 Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Thu, 20 Sep 2018 11:04:02 +0100 Subject: [PATCH 4/6] Experimentally downgrading to lein-release 1.0.5 ... because this version worked for lein-adl --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 1cea1b9..e9f57cb 100644 --- a/project.clj +++ b/project.clj @@ -11,7 +11,7 @@ [selmer "1.11.8"]] :plugins [[lein-codox "0.10.4"] - [lein-release "1.1.3"]] + [lein-release "1.0.5"]] :deploy-repositories [["releases" :clojars] ["snapshots" :clojars]] From 88c5039fa06097f2d9169b32822536932825bc40 Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Thu, 20 Sep 2018 11:04:12 +0100 Subject: [PATCH 5/6] lein-release plugin: preparing 0.1.4 release --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index e9f57cb..7faf280 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject adl-support "0.1.4-SNAPSHOT" +(defproject adl-support "0.1.4" :description "A small library of functions called by generated ADL code." :url "https://github.com/simon-brooke/adl-support" :license {:name "MIT License" From 6ec81240e0a5d7c00df483fba73e089425d000ec Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Thu, 20 Sep 2018 11:05:04 +0100 Subject: [PATCH 6/6] lein-release plugin: bumped version from 0.1.4 to 0.1.5-SNAPSHOT for next development cycle --- project.clj | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/project.clj b/project.clj index 7faf280..afdc4c2 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject adl-support "0.1.4" +(defproject adl-support "0.1.5-SNAPSHOT" :description "A small library of functions called by generated ADL code." :url "https://github.com/simon-brooke/adl-support" :license {:name "MIT License" @@ -16,9 +16,8 @@ :deploy-repositories [["releases" :clojars] ["snapshots" :clojars]] - ;; `lein release` doesn't work with `git flow release`. To use - ;; `lein release`, first merge `develop` into `master`, and then, in branch - ;; `master`, run `lein release` + ;; `lein release` doesn't play nice with `git flow release`. Run `lein release` in the + ;; `develop` branch, then reset the `master` branch to the release tag. :release-tasks [["vcs" "assert-committed"] ["clean"]