Skip to content

Commit

Permalink
Merge pull request #773 from Scalingo/release/1.24.2
Browse files Browse the repository at this point in the history
Bump version 1.24.2
  • Loading branch information
EtienneM authored Aug 29, 2022
2 parents ea31807 + bb66167 commit f45bfb0
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 13 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

### To be Released

# 1.24.2

* fix(releases): Correctly auto generate changelog [#772](https://github.com/Scalingo/cli/pull/772)
* feat(cli-changelog): add cli-changelog command and show the changelog after an update [#767](https://github.com/Scalingo/cli/pull/767)
* feat(changelog): add changelog command and show the changelog after an update [#767](https://github.com/Scalingo/cli/pull/767)

# 1.24.1

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.24.1
# Scalingo-CLI v1.24.2

![publish workflow](https://github.com/Scalingo/cli/actions/workflows/publish.yml/badge.svg)

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

```bash
git checkout <base commit ID>
git checkout -b v1.24.1
git checkout -b v1.24.2
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.24.1
git push --set-upstream origin v1.24.2
```

### New Version Bump
Expand All @@ -279,10 +279,10 @@ Bump new version number in:
And commit these changes:

```bash
git switch --create release/1.24.1
git switch --create release/1.24.2
git add .
git commit -m "Bump version 1.24.1"
git push --set-upstream origin release/1.24.1
git commit -m "Bump version 1.24.2"
git push --set-upstream origin release/1.24.2
gh pr create --reviewer=EtienneM --title "$(git log -1 --pretty=%B)"
```

Expand All @@ -291,8 +291,8 @@ Once the pull request merged, you can tag the new release.
#### Tag the New Release

```bash
git tag 1.24.1
git push origin master 1.24.1
git tag 1.24.2
git push origin master 1.24.2
```

Pushing the tag triggers a GitHub Action which builds the cross-platform binaries and create a new release.
Expand All @@ -307,6 +307,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.24.1 https://cli.scalingo.com - More news at https://changelog.scalingo.com #cli #paas #changelog #bugfix
> [Changelog] CLI - Release of version 1.24.2 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.24.1
1.24.2
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.24.1"
var Version = "1.24.2"

0 comments on commit f45bfb0

Please sign in to comment.