diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2018-07-21 17:16:17 +0800 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2018-07-21 17:16:17 +0800 |
| commit | 7f83144e70c2779578a9539a0e36e5a619fa6263 (patch) | |
| tree | 7016ab5c2f19a4589942ee3d363e65b858e9977d | |
| parent | 8efadcaf3a50e3c4dc503ecefc70d3fcbba48c8b (diff) | |
| parent | 39d625ce53bb1e1b9b03d9c9c70aa81e94fcc66a (diff) | |
Merge tag 'v1.12'
| -rw-r--r-- | .bumpversion.cfg | 2 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | buttercup-pkg.el | 2 | ||||
| -rw-r--r-- | buttercup.el | 8 | ||||
| -rwxr-xr-x | scripts/release | 17 |
5 files changed, 24 insertions, 7 deletions
diff --git a/.bumpversion.cfg b/.bumpversion.cfg index f095958..537af7d 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.11 +current_version = 1.12 parse = (?P<major>\d+)\.(?P<minor>.*) serialize = {major}.{minor} files = buttercup.el buttercup-pkg.el @@ -1,6 +1,6 @@ # Buttercup — Behavior-Driven Emacs Lisp Testing -[](https://travis-ci.org/jorgenschaefer/emacs-buttercup) +[](https://travis-ci.org/jorgenschaefer/emacs-buttercup) [](http://stable.melpa.org/#/buttercup)  diff --git a/buttercup-pkg.el b/buttercup-pkg.el index 3ea3c52..7c41183 100644 --- a/buttercup-pkg.el +++ b/buttercup-pkg.el @@ -1,2 +1,2 @@ -(define-package "buttercup" "1.11" +(define-package "buttercup" "1.12" "Behavior-Driven Emacs Lisp Testing") diff --git a/buttercup.el b/buttercup.el index 0d271c8..c199f16 100644 --- a/buttercup.el +++ b/buttercup.el @@ -2,7 +2,7 @@ ;; Copyright (C) 2015-2017 Jorgen Schaefer <contact@jorgenschaefer.de> -;; Version: 1.11 +;; Version: 1.12 ;; Author: Jorgen Schaefer <contact@jorgenschaefer.de> ;; Package-Requires: ((emacs "24.3")) ;; URL: https://github.com/jorgenschaefer/emacs-buttercup @@ -452,7 +452,7 @@ See also `buttercup-define-matcher'." spec))) (a-uniques (cons nil (buttercup-format-spec - "Expected `%A' to contain the e items as `%b', but `%p' are present unexprctedly." + "Expected `%A' to contain the same items as `%b', but `%p' are present unexpectedly." spec))) (b-uniques (cons nil (buttercup-format-spec @@ -700,8 +700,8 @@ See also `buttercup-define-matcher'." (cons (buttercup-suite-or-spec-parent suite-or-spec) (buttercup-suite-or-spec-parents (buttercup-suite-or-spec-parent suite-or-spec))))) -(define-obsolete-function-alias 'buttercup-suite-parents 'buttercup-suite-or-spec-parents "emacs-buttercup 1.11") -(define-obsolete-function-alias 'buttercup-spec-parents 'buttercup-suite-or-spec-parents "emacs-buttercup 1.11") +(define-obsolete-function-alias 'buttercup-suite-parents 'buttercup-suite-or-spec-parents "emacs-buttercup 1.12") +(define-obsolete-function-alias 'buttercup-spec-parents 'buttercup-suite-or-spec-parents "emacs-buttercup 1.12") (defun buttercup-suites-total-specs-defined (suite-list) "Return the number of specs defined in all suites in SUITE-LIST." diff --git a/scripts/release b/scripts/release new file mode 100755 index 0000000..cbbf50e --- /dev/null +++ b/scripts/release @@ -0,0 +1,17 @@ +#!/bin/bash + +set -e +cd "$(dirname "$0")/.." + +main() { + run bumpversion minor + run git push + run git push --tags +} + +run() { + echo "\$ $*" + "$@" +} + +main |