Skip to content

Commit

Permalink
Merge pull request #810 from Scalingo/release/1.26.0
Browse files Browse the repository at this point in the history
Bump version 1.26.0
  • Loading branch information
EtienneM authored Oct 7, 2022
2 parents 16237f1 + 0aa649d commit fdb48a3
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 12 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)

Expand Down Expand Up @@ -56,7 +56,7 @@ USAGE:
scalingo [global options] command [command options] [arguments...]
VERSION:
1.25.1
1.26.0
AUTHOR:
Scalingo Team <hello@scalingo.com>
Expand Down Expand Up @@ -260,12 +260,12 @@ the commit for the version bump.

```bash
git checkout <base commit ID>
git checkout -b v1.25.1
git checkout -b v1.26.0
git cherry-pick -m 1 <commit ID number 1>
git cherry-pick -m 1 <commit ID number 2>
...
git cherry-pick -m 1 <commit ID number X>
git push --set-upstream origin v1.25.1
git push --set-upstream origin v1.26.0
```

### New Version Bump
Expand All @@ -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)"
```

Expand All @@ -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.
Expand All @@ -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.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.25.1
1.26.0
2 changes: 1 addition & 1 deletion config/version.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package config

var Version = "1.25.1"
var Version = "1.26.0"

0 comments on commit fdb48a3

Please sign in to comment.