From 0cc56d75cfbf54f155f416fb50f2e70fca960052 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Thu, 18 May 2023 01:54:00 +0000 Subject: [PATCH 1/3] Version bump --- box.json | 2 +- changelog.md | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/box.json b/box.json index 75196bf..d004256 100644 --- a/box.json +++ b/box.json @@ -1,6 +1,6 @@ { "name":"ColdBox CLI", - "version":"7.1.0", + "version":"7.2.0", "location":"https://downloads.ortussolutions.com/ortussolutions/commandbox-modules/coldbox-cli/@build.version@/coldbox-cli-@build.version@.zip", "slug":"coldbox-cli", "author":"Ortus Solutions, Corp", diff --git a/changelog.md b/changelog.md index 09cfac7..86ff809 100644 --- a/changelog.md +++ b/changelog.md @@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [7.1.0] - 2023-05-18 + ### Added - `BaseCommand` hierarchy for all commands to inherit from @@ -58,6 +60,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Eclipse support -[Unreleased]: https://github.com/ColdBox/coldbox-cli/compare/v1.0.0...HEAD +[Unreleased]: https://github.com/ColdBox/coldbox-cli/compare/v7.1.0...HEAD + +[7.1.0]: https://github.com/ColdBox/coldbox-cli/compare/v1.0.0...v7.1.0 [1.0.0]: https://github.com/ColdBox/coldbox-cli/compare/94e639a1ba9d10c8d9ad663435233bd115cf8586...v1.0.0 From 83dc57104f4525f394fb66f319885f026bb675f7 Mon Sep 17 00:00:00 2001 From: Luis Majano Date: Thu, 18 May 2023 15:22:12 -0500 Subject: [PATCH 2/3] - New version of CommandBox Migrations - Added `testbox-cli` as a dependency --- box.json | 3 ++- changelog.md | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/box.json b/box.json index d004256..9a2c31c 100644 --- a/box.json +++ b/box.json @@ -28,7 +28,8 @@ "commandbox-docbox":"*" }, "dependencies":{ - "commandbox-migrations":"^4.0.0" + "commandbox-migrations":"^5.0.0", + "testbox-cli":"^1.0.0" }, "installPaths":{}, "ignore":[ diff --git a/changelog.md b/changelog.md index 86ff809..e69aa24 100644 --- a/changelog.md +++ b/changelog.md @@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Added + +- New version of CommandBox Migrations +- Added `testbox-cli` as a dependency + ## [7.1.0] - 2023-05-18 ### Added From d2e2f22d3bc39c0b38bbd44b8bf3103c09ceff9f Mon Sep 17 00:00:00 2001 From: Luis Majano Date: Thu, 18 May 2023 15:24:34 -0500 Subject: [PATCH 3/3] updated recipe for release --- build/release.boxr | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/build/release.boxr b/build/release.boxr index e216f22..14b2c02 100755 --- a/build/release.boxr +++ b/build/release.boxr @@ -7,19 +7,5 @@ # Merge development into it for release !git merge --no-ff development -# Tag the master repo with the version from box.json -!git tag v`box package show version` - # Push all branches back out to github !git push origin --all - -# Push all tags -!git push origin --tags - -# Check development again -!git checkout -f development - -# Bump to prepare for a new release, do minor, change if needed and don't tag -bump --minor --!tagVersion -!git commit -a -m "version bump" -!git push origin development \ No newline at end of file