diff --git a/CHANGELOG.md b/CHANGELOG.md index f1e44d2af..2526ee3a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ### To be Released +### 1.26.0 + * feat(db-commands) Add `database-enable-feature` and `database-disable-feature` for database addons [#807](https://github.com/Scalingo/cli/pull/807) * deps(go-scalingo) Bump from 5.2.2 to 6.0.0 [#804](https://github.com/Scalingo/pull/804) * regression(cmd-alias) 'scale' command can again be invoked by 's' [#802](https://github.com/Scalingo/cli/pull/802) diff --git a/README.md b/README.md index 1a05e4f3c..164735e5f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Scalingo-CLI v1.25.1 +# Scalingo-CLI v1.26.0 ![publish workflow](https://github.com/Scalingo/cli/actions/workflows/publish.yml/badge.svg) @@ -56,7 +56,7 @@ USAGE: scalingo [global options] command [command options] [arguments...] VERSION: - 1.25.1 + 1.26.0 AUTHOR: Scalingo Team @@ -260,12 +260,12 @@ the commit for the version bump. ```bash git checkout -git checkout -b v1.25.1 +git checkout -b v1.26.0 git cherry-pick -m 1 git cherry-pick -m 1 ... git cherry-pick -m 1 -git push --set-upstream origin v1.25.1 +git push --set-upstream origin v1.26.0 ``` ### New Version Bump @@ -280,10 +280,10 @@ Bump new version number in: And commit these changes: ```bash -git switch --create release/1.25.1 +git switch --create release/1.26.0 git add . -git commit -m "Bump version 1.25.1" -git push --set-upstream origin release/1.25.1 +git commit -m "Bump version 1.26.0" +git push --set-upstream origin release/1.26.0 gh pr create --reviewer=EtienneM --title "$(git log -1 --pretty=%B)" ``` @@ -292,8 +292,8 @@ Once the pull request merged, you can tag the new release. #### Tag the New Release ```bash -git tag 1.25.1 -git push origin master 1.25.1 +git tag 1.26.0 +git push origin master 1.26.0 ``` Pushing the tag triggers a GitHub Action which builds the cross-platform binaries and create a new release. @@ -308,6 +308,6 @@ It serves as cache between GitHub and our customers for a more efficient check o You can now update the [changelog](https://doc.scalingo.com/changelog) and tweet about it! -> [Changelog] CLI - Release of version 1.25.1 https://cli.scalingo.com - More news at https://changelog.scalingo.com #cli #paas #changelog #bugfix +> [Changelog] CLI - Release of version 1.26.0 https://cli.scalingo.com - More news at https://changelog.scalingo.com #cli #paas #changelog #bugfix Add in a tweets thread the changelog of this new version. diff --git a/VERSION b/VERSION index d905a6d1d..5ff8c4f5d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.25.1 +1.26.0 diff --git a/config/version.go b/config/version.go index 693c6fe65..9337a1178 100644 --- a/config/version.go +++ b/config/version.go @@ -1,3 +1,3 @@ package config -var Version = "1.25.1" +var Version = "1.26.0"