Skip to content

Commit

Permalink
Merge pull request #1025 from Scalingo/release/1.30.0
Browse files Browse the repository at this point in the history
Bump version 1.30.0
  • Loading branch information
EtienneM authored Dec 20, 2023
2 parents b9d0df2 + 0ffdfc5 commit 4fe4d83
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 13 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.30.0

* feat(addons): add user management commands ([PR#1019](https://github.com/Scalingo/cli/pull/1019))
* chore(term): remove `github.com/andrew-d/go-termutil`, use standard library instead ([PR#974](https://github.com/Scalingo/cli/pull/974))
* feat(cmd): addon can be retrieve from addon type, not only UUID ([PR#983](https://github.com/Scalingo/cli/pull/983))
Expand Down
24 changes: 13 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Scalingo-CLI v1.29.1
# Scalingo-CLI v1.30.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.29.1
1.30.0
AUTHOR:
Scalingo Team <hello@scalingo.com>
Expand Down Expand Up @@ -263,12 +263,12 @@ the commit for the version bump.

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

### New Version Bump
Expand All @@ -283,20 +283,22 @@ Bump new version number in:
And commit these changes:

```bash
git switch --create release/1.29.1
version="1.30.0"

git switch --create release/${version}
git add .
git commit -m "Bump version 1.29.1"
git push --set-upstream origin release/1.29.1
gh pr create --reviewer=EtienneM --title "$(git log -1 --pretty=%B)"
git commit -m "Bump version ${version}"
git push --set-upstream origin release/${version}
gh pr create --reviewer=EtienneM --title "$(git log -1 --pretty=%B)" --fill-first --base master
```

Once the pull request merged, you can tag the new release.

#### Tag the New Release

```bash
git tag 1.29.1
git push origin master 1.29.1
git tag ${version}
git push origin master ${version}
```

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

0 comments on commit 4fe4d83

Please sign in to comment.