From 97054b9ad9d7bb05c4d9aa30ae3b003b73134906 Mon Sep 17 00:00:00 2001 From: Filipe Esperandio Date: Wed, 5 Jun 2019 14:14:32 +0100 Subject: [PATCH 1/6] Create new version branch off the previous one instead of master --- bin/newver | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/newver b/bin/newver index 2fdb9be0..2407e267 100755 --- a/bin/newver +++ b/bin/newver @@ -7,7 +7,12 @@ if [ $# -eq 0 ]; then fi NEWVER="$1" +previous_channel() { + ruby -e "version = \"${NEWVER}\".match(/(\d+).(\d+).(\d+)/); minor = version[2].to_i - 1; puts \"channel/rubocop-#{version[1]}-#{minor}\"" +} + git checkout Gemfile* +git checkout $(previous_channel) git checkout -b "newver/${NEWVER}" ed Gemfile <<-EDITS From e44ca2b89a072a131c028df21a4e66cdc6570568 Mon Sep 17 00:00:00 2001 From: Filipe Esperandio Date: Wed, 5 Jun 2019 14:17:42 +0100 Subject: [PATCH 2/6] Adjust script --- bin/newver | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/newver b/bin/newver index 2407e267..17b33f02 100755 --- a/bin/newver +++ b/bin/newver @@ -8,7 +8,9 @@ fi NEWVER="$1" previous_channel() { - ruby -e "version = \"${NEWVER}\".match(/(\d+).(\d+).(\d+)/); minor = version[2].to_i - 1; puts \"channel/rubocop-#{version[1]}-#{minor}\"" + ruby -e "version = \"${NEWVER}\".match(/(\d+).(\d+).(\d+)/); \ + minor = version[2].to_i - 1; \ + puts \"channel/rubocop-#{version[1]}-#{minor}\"" } git checkout Gemfile* @@ -16,7 +18,7 @@ git checkout $(previous_channel) git checkout -b "newver/${NEWVER}" ed Gemfile <<-EDITS -/gem "parser",/c +/gem "parser"/c gem "parser" . /gem "rubocop",/c From b0eb201a566eb8b77cba24ddb959469d7867c23b Mon Sep 17 00:00:00 2001 From: Filipe Esperandio Date: Wed, 5 Jun 2019 17:29:10 +0100 Subject: [PATCH 3/6] Fetch branches before changing to channel --- bin/newver | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/newver b/bin/newver index 17b33f02..d8eef825 100755 --- a/bin/newver +++ b/bin/newver @@ -14,6 +14,7 @@ previous_channel() { } git checkout Gemfile* +git fetch origin git checkout $(previous_channel) git checkout -b "newver/${NEWVER}" From d30f230f9651e8be78e3f843c5ab6da0cdb29e79 Mon Sep 17 00:00:00 2001 From: Filipe Esperandio Date: Fri, 7 Jun 2019 10:34:35 +0100 Subject: [PATCH 4/6] Better ruby input --- bin/newver | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/newver b/bin/newver index d8eef825..19959682 100755 --- a/bin/newver +++ b/bin/newver @@ -8,9 +8,11 @@ fi NEWVER="$1" previous_channel() { - ruby -e "version = \"${NEWVER}\".match(/(\d+).(\d+).(\d+)/); \ - minor = version[2].to_i - 1; \ - puts \"channel/rubocop-#{version[1]}-#{minor}\"" + cat < Date: Fri, 7 Jun 2019 10:34:57 +0100 Subject: [PATCH 5/6] No need, parser does not have a fixed version any more --- bin/newver | 3 --- 1 file changed, 3 deletions(-) diff --git a/bin/newver b/bin/newver index 19959682..8fc3e002 100755 --- a/bin/newver +++ b/bin/newver @@ -21,9 +21,6 @@ git checkout $(previous_channel) git checkout -b "newver/${NEWVER}" ed Gemfile <<-EDITS -/gem "parser"/c -gem "parser" -. /gem "rubocop",/c gem "rubocop", "${NEWVER}", require: false . From d8ca0dfdee11644471eebc130c9ab8684a7886b9 Mon Sep 17 00:00:00 2001 From: Filipe Esperandio Date: Fri, 7 Jun 2019 10:37:12 +0100 Subject: [PATCH 6/6] Fix ruby syntax --- bin/newver | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/newver b/bin/newver index 8fc3e002..5c23f5ab 100755 --- a/bin/newver +++ b/bin/newver @@ -8,11 +8,11 @@ fi NEWVER="$1" previous_channel() { - cat <