Skip to content

Commit

Permalink
Bump version 1.20.1
Browse files Browse the repository at this point in the history
  • Loading branch information
EtienneM committed Apr 16, 2021
1 parent d5a7471 commit aadf2a7
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .goxc.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"Include": "INSTALL*,README.md,LICENSE*",
"Exclude": "*.go"
},
"PackageVersion": "1.20.0",
"PackageVersion": "1.20.1",
"ConfigVersion": "0.9"
}
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.20.1

* fix(backup_download): no log on stdout when using '--output -' flag [#646](https://github.com/Scalingo/cli/pull/646)
* `deployment-logs` displays the last deployment logs if none is provided [#647](https://github.com/Scalingo/cli/pull/647)

Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Scalingo-CLI v1.20.0
# Scalingo-CLI v1.20.1

[![Codeship Status for Scalingo/cli](https://app.codeship.com/projects/d3ee7f70-ac5f-0137-8f24-1ae29f023aca/status?branch=master)](https://app.codeship.com/projects/362207)

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

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

### New Version Bump
Expand All @@ -276,14 +276,14 @@ And commit these changes:

```bash
$ git add .
$ git commit -m "Bump version 1.20.0"
$ git commit -m "Bump version 1.20.1"
$ git push origin master
```

#### Tag the New Release

```bash
git tag 1.20.0
git tag 1.20.1
git push --tags
```

Expand All @@ -292,7 +292,7 @@ git push --tags
Build the new version for all platforms with:

```sh
./dists/make-release.sh -v 1.20.0 -b
./dists/make-release.sh -v 1.20.1 -b
```

Tag and release a new version on GitHub
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.20.0
1.20.1
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.20.0"
var Version = "1.20.1"

0 comments on commit aadf2a7

Please sign in to comment.