Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
lmajano committed May 18, 2023
2 parents 6516e52 + d2e2f22 commit 6ba0f6a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 16 deletions.
5 changes: 3 additions & 2 deletions box.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -28,7 +28,8 @@
"commandbox-docbox":"*"
},
"dependencies":{
"commandbox-migrations":"^4.0.0"
"commandbox-migrations":"^5.0.0",
"testbox-cli":"^1.0.0"
},
"installPaths":{},
"ignore":[
Expand Down
14 changes: 0 additions & 14 deletions build/release.boxr
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 7 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

- New version of CommandBox Migrations
- Added `testbox-cli` as a dependency

## [7.1.0] - 2023-05-18

### Added

- `BaseCommand` hierarchy for all commands to inherit from
- New print functions for uniformity of info, warning, success and error messages
- New `coldbox create service` command to create services easily
Expand Down

0 comments on commit 6ba0f6a

Please sign in to comment.