From e2cfd7cb4c25b9f6e5f815a41d962c11d8919c98 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 2 Mar 2017 12:47:43 -0500 Subject: [PATCH 1/5] rake/release: allow releases from *-stable branches. --- rake/release.rake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rake/release.rake b/rake/release.rake index 832b5bb3..e9b63845 100644 --- a/rake/release.rake +++ b/rake/release.rake @@ -6,7 +6,8 @@ desc "Release #{name} v#{version}" task :release => :build do - unless `git branch` =~ %r!^\* master$! + current_branch = `git branch`.to_s.strip.match(%r!^\* (.+)$!)[1] + unless current_branch == "master" || current_branch.end_with?("-stable") puts "You must be on the master branch to release!" exit! end From ac727f22a35af4665bf6ee1d0e413c22471c458b Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 2 Mar 2017 12:49:54 -0500 Subject: [PATCH 2/5] travis: build *-stable branches. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 3a6ef68b..e88878de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,7 @@ branches: only: - master - themes + - /*-stable$/ notifications: slack: From 1fbca40f0b4c1dc94a9deeeb57cff6505dd243da Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 2 Mar 2017 12:50:36 -0500 Subject: [PATCH 3/5] appveyor: build *-stable branches. --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 2fe407f4..224770f8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,6 +6,7 @@ branches: only: - master - themes + - /*-stable$/ build: off From fa9a80b15f9e206c19b1626ea52c8ee6ccc9b760 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 2 Mar 2017 12:56:20 -0500 Subject: [PATCH 4/5] You never really know what 'regexp support' means until you break it. --- .travis.yml | 2 +- appveyor.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e88878de..36f2d6ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ branches: only: - master - themes - - /*-stable$/ + - /*-stable/ notifications: slack: diff --git a/appveyor.yml b/appveyor.yml index 224770f8..d03507d1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,7 @@ branches: only: - master - themes - - /*-stable$/ + - /*-stable/ build: off From 97375b38c7a08eaf9c0469ae3a07dc0d78c5f66c Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 2 Mar 2017 12:59:34 -0500 Subject: [PATCH 5/5] Appveyor couldn't possibly support what it says it does in the docs. https://ci.appveyor.com/project/jekyll/jekyll/build/1.0.1402 --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index d03507d1..2fe407f4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,6 @@ branches: only: - master - themes - - /*-stable/ build: off