From daff28b1d368b66a0a4f41651ba25de7da601660 Mon Sep 17 00:00:00 2001 From: George Date: Fri, 6 Oct 2023 07:35:23 -0400 Subject: [PATCH 1/2] Fix version validation function --- README.md | 12 ------------ flow | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/README.md b/README.md index 8f712b1..5e87584 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,6 @@ Additionally, Flow handles version incrementing and maintains a changelog. Befor - [Usage example](https://github.com/internetguru/flow/blob/dev/flow.1.rst#flow-example) - [Blog posts on Flow](https://blog.internetguru.io/categories/flow/) - ### Branching model automation - Flow requires *no arguments* and derives a default action. @@ -36,12 +35,10 @@ Additionally, Flow handles version incrementing and maintains a changelog. Befor - Flow can convert any existing git repository to a git branching model. - Flow automatically adapts to existing branches, such as 'release' instead of the default 'staging'. - ## Installation Download the [latest release from GitHub](https://github.com/internetguru/flow/releases/latest). You can install as a single file (easiest), with compiled distribution package (useful for system-wide install) or from the source. - ### Requirements - [Bash](https://www.gnu.org/software/bash/), version 3.2 or later @@ -53,7 +50,6 @@ Download the [latest release from GitHub](https://github.com/internetguru/flow/r - [GNU awk](https://www.gnu.org/software/gawk/) - On macOS install with Homebrew [`homebrew/dupes/grep`](https://github.com/Homebrew/homebrew-dupes) - ### Single file script 1. Place flow.sh into your `$PATH` (e.g. `~/bin`). @@ -62,7 +58,6 @@ Download the [latest release from GitHub](https://github.com/internetguru/flow/r chmod +x flow.sh ``` - ### Compiled distribution package 1. Extract the archive. @@ -87,7 +82,6 @@ This is how to install the script without root permissions. BINPATH=~/bin SHAREPATH=~/.local/share ./install ``` - ### Building from source You will need the following dependencies: @@ -114,7 +108,6 @@ PREFIX=/usr make See the [man page](flow.1.rst) for more information and examples. - ### Running unit tests Testing the script requires a built 'flow' command and [Bash Unit Testing Tool](https://github.com/internetguru/butt) -- AKA the 'butt' command. @@ -123,12 +116,10 @@ Testing the script requires a built 'flow' command and [Bash Unit Testing Tool]( butt ~/flow/test/test.butt ``` - ## Contributing Pull requests are welcome. Don't hesitate to contribute. - ## Copyright Copyright © 2016--2023 [Internet Guru](https://www.internetguru.io) @@ -139,7 +130,6 @@ For commercial use, a nominal fee may be applicable based on the company size an Please do not hesitate to reach out to us for inquiries related to seminars, workshops, training, integration, support, custom development, and additional services. We are more than happy to assist you. - ## Donation If you find this script useful, please consider making a donation to support its developers. We appreciate any contributions, no matter how small. Donations help us to dedicate more time and resources to this project, including covering our infrastructure expenses. @@ -150,14 +140,12 @@ Please note that we are not a tax-exempt organization and cannot provide tax ded Thank you for your continued support! - ### Honored donors - [Czech Technical University in Prague](https://www.fit.cvut.cz/en) - [WebExpo Conference in Prague](https://webexpo.net/) - [DATAMOLE data mining and machine learning](https://www.datamole.cz/) - ## Alternatives - [git-flow](https://github.com/nvie/gitflow) – The original Vincent Driessen's tools. diff --git a/flow b/flow index 0130e8a..65c4a85 100755 --- a/flow +++ b/flow @@ -424,7 +424,7 @@ main() { } is_valid_version() { - [[ "${1}" =~ ^[0-9]+\.[0-9]+\.[0-9]$ ]] + [[ "${1}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] } parse_version() { From c6f602bfe23df827dbf6054b7bbe30db0d65787f Mon Sep 17 00:00:00 2001 From: George Date: Fri, 6 Oct 2023 07:36:04 -0400 Subject: [PATCH 2/2] Update control files --- CHANGELOG.md | 7 +++++++ VERSION | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53758f8..838c722 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [3.0.11] - 2023-10-06 + +### Fixed + +- Version validation format single-digit patch number. + ## [3.0.10] - 2023-07-17 ### Fixed @@ -159,6 +165,7 @@ _Stable release based on [3.0.0-rc.2]._ ## [1.0.0] - 2016-12-22 +[3.0.11]: https://https://github.com/internetguru/flow/compare/v3.0.10...v3.0.11 [3.0.10]: https://https://github.com/internetguru/flow/compare/v3.0.9...3.0.10 [3.0.9]: https://https://github.com/internetguru/flow/compare/v3.0.8...v3.0.9 [3.0.8]: https://https://github.com/internetguru/flow/compare/v3.0.7...v3.0.8 diff --git a/VERSION b/VERSION index a909317..778bf95 100755 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.10 +3.0.11