diff --git a/.goxc.json b/.goxc.json index d3b940c36..8c7bb8aec 100644 --- a/.goxc.json +++ b/.goxc.json @@ -7,6 +7,6 @@ "Include": "INSTALL*,README.md,LICENSE*", "Exclude": "*.go" }, - "PackageVersion": "1.20.2", + "PackageVersion": "1.21.0", "ConfigVersion": "0.9" } diff --git a/CHANGELOG.md b/CHANGELOG.md index d6dc3414e..fd723f128 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,10 @@ ### To be Released +### 1.21.0 + * fix(backup-download): Now download the last successful backup [#663](https://github.com/Scalingo/cli/pull/663) -* fix(review-app-url): add app url in the tablewriter [#664](https://github.com/Scalingo/cli/pull/664) +* fix(review-app-url): add app url in the table [#664](https://github.com/Scalingo/cli/pull/664) * fix(backups-download): print error on stderr if the backup status is not 'done' [#665](https://github.com/Scalingo/cli/pull/665) * feat(command): add command `cron-tasks` to list cron tasks of an application [#670](https://github.com/Scalingo/cli/pull/670) * fix(run): allow an equals sign (=) in environment variable values [#674](https://github.com/Scalingo/cli/pull/674) diff --git a/README.md b/README.md index a43cfbb0d..e578cda76 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Scalingo-CLI v1.20.2 +# Scalingo-CLI v1.21.0 [![Codeship Status for Scalingo/cli](https://app.codeship.com/projects/d3ee7f70-ac5f-0137-8f24-1ae29f023aca/status?branch=master)](https://app.codeship.com/projects/362207) @@ -56,7 +56,7 @@ USAGE: scalingo-cli [global options] command [command options] [arguments...] VERSION: - 1.20.2 + 1.21.0 AUTHOR: Scalingo Team @@ -126,6 +126,9 @@ COMMANDS: domains-remove Remove a custom domain from an application domains-ssl Enable or disable SSL for your custom domains + Cron Tasks: + cron-tasks List the cron tasks of an application + Databases: redis-console Run an interactive console with your Redis addon mongo-console Run an interactive console with your MongoDB addon @@ -239,8 +242,8 @@ SCALINGO_API_URL=http://172.17.0.1:3001 SCALINGO_AUTH_URL=http://172.17.0.1:1234 Get the latest version of the CLI: ```bash -$ git checkout master -$ git pull origin master +git switch master +git pull origin master ``` ### (optional) Cherry Pick Commits Included in the Release @@ -254,12 +257,12 @@ the commit for the version bump. ```bash git checkout -git checkout -b v1.20.2 +git checkout -b v1.21.0 git cherry-pick -m 1 git cherry-pick -m 1 ... git cherry-pick -m 1 -git push --set-upstream origin v1.20.2 +git push --set-upstream origin v1.21.0 ``` ### New Version Bump @@ -275,15 +278,15 @@ Bump new version number in: And commit these changes: ```bash -$ git add . -$ git commit -m "Bump version 1.20.2" -$ git push origin master +git add . +git commit -m "Bump version 1.21.0" +git push origin master ``` #### Tag the New Release ```bash -git tag 1.20.2 +git tag 1.21.0 git push --tags ``` @@ -292,7 +295,7 @@ git push --tags Build the new version for all platforms with: ```sh -./dists/make-release.sh -v 1.20.2 -b +./dists/make-release.sh -v 1.21.0 -b ``` Tag and release a new version on GitHub @@ -309,6 +312,6 @@ scalingo --region osc-fr1 -a cli-download-service restart You can now update the [changelog](https://doc.scalingo.com/changelog) and tweet about it! -> [Changelog] CLI - Release of version 1.20.2 https://cli.scalingo.com - More news at https://changelog.scalingo.com #cli #paas #changelog #bugfix +> [Changelog] CLI - Release of version 1.21.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 769e37e15..3500250a4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.20.2 +1.21.0 diff --git a/config/version.go b/config/version.go index 60ea46213..cdc3e8661 100644 --- a/config/version.go +++ b/config/version.go @@ -1,3 +1,3 @@ package config -var Version = "1.20.2" +var Version = "1.21.0"