From feba6c3078d76076bdf0abec7dc8090bc238f2a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20Michon?= Date: Fri, 18 Nov 2022 11:54:20 +0100 Subject: [PATCH] Bump version 1.26.1 --- CHANGELOG.md | 3 +++ README.md | 20 ++++++++++---------- VERSION | 2 +- config/version.go | 2 +- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1caac937..065ee001d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,12 @@ ### To be Released +### 1.26.1 + * deps(urfave/cli): Bumpd from 2.17.1 to 2.23.5: fix options display regression in --help [#814](https://github.com/Scalingo/cli/pull/814) * deps(websocket): Replace golang.org/x/net/websocket with github.com/gorilla/websocket [#822](https://github.com/Scalingo/cli/pull/822) * deps(survey): upgrade gopkg.in/AlecAivazis/survey.v1 to github.com/AlecAivazis/survey/v2 [#821](https://github.com/Scalingo/cli/pull/821) +* fix(logdrains): delete Logentries mentions [#820](https://github.com/Scalingo/cli/pull/820) ### 1.26.0 diff --git a/README.md b/README.md index 164735e5f..68ff8b89a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Scalingo-CLI v1.26.0 +# Scalingo-CLI v1.26.1 ![publish workflow](https://github.com/Scalingo/cli/actions/workflows/publish.yml/badge.svg) @@ -56,7 +56,7 @@ USAGE: scalingo [global options] command [command options] [arguments...] VERSION: - 1.26.0 + 1.26.1 AUTHOR: Scalingo Team @@ -260,12 +260,12 @@ the commit for the version bump. ```bash git checkout -git checkout -b v1.26.0 +git checkout -b v1.26.1 git cherry-pick -m 1 git cherry-pick -m 1 ... git cherry-pick -m 1 -git push --set-upstream origin v1.26.0 +git push --set-upstream origin v1.26.1 ``` ### New Version Bump @@ -280,10 +280,10 @@ Bump new version number in: And commit these changes: ```bash -git switch --create release/1.26.0 +git switch --create release/1.26.1 git add . -git commit -m "Bump version 1.26.0" -git push --set-upstream origin release/1.26.0 +git commit -m "Bump version 1.26.1" +git push --set-upstream origin release/1.26.1 gh pr create --reviewer=EtienneM --title "$(git log -1 --pretty=%B)" ``` @@ -292,8 +292,8 @@ Once the pull request merged, you can tag the new release. #### Tag the New Release ```bash -git tag 1.26.0 -git push origin master 1.26.0 +git tag 1.26.1 +git push origin master 1.26.1 ``` Pushing the tag triggers a GitHub Action which builds the cross-platform binaries and create a new release. @@ -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.26.0 https://cli.scalingo.com - More news at https://changelog.scalingo.com #cli #paas #changelog #bugfix +> [Changelog] CLI - Release of version 1.26.1 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 5ff8c4f5d..dd43a143f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.26.0 +1.26.1 diff --git a/config/version.go b/config/version.go index 9337a1178..81ddfdfde 100644 --- a/config/version.go +++ b/config/version.go @@ -1,3 +1,3 @@ package config -var Version = "1.26.0" +var Version = "1.26.1"