Merge branch 'master' into taz/fix-restore-target

Author: taz

.travis.yml

@@ -1,4 +1,5 @@
 ---
+language: minimal
 matrix:
   include:
     - os: osx

script/cibuild

@@ -6,10 +6,7 @@ set -e
 # place with this version at the beginning of each test and many commands have
 # conditional logic based on the remote version. Running the suite against
 # different major versions ensures we're covering these conditional paths.
-REMOTE_VERSIONS="
-  2.14.0
-  2.16.0
-"
+REMOTE_VERSIONS="2.14.0 2.16.0"
 
 # Enable verbose logging of ssh commands
 export GHE_VERBOSE_SSH=true

script/release

@@ -209,6 +209,10 @@ def bump_version(new_version, min_version = nil, path = 'share/github-backup-uti
     content = File.read('test/testlib.sh')
     new_content = content.gsub(/GHE_TEST_REMOTE_VERSION:=[0-9]\.[0-9]+\.0/,"GHE_TEST_REMOTE_VERSION:=#{new_version}")
     File.open('test/testlib.sh', 'w') {|file| file.puts new_content }
+
+    content = File.read('script/cibuild')
+    new_content = content.gsub(/^REMOTE_VERSIONS=.*$/, "REMOTE_VERSIONS=\"#{min_version} #{new_version}\"")
+    File.open('script/cibuild', 'w') {|file| file.puts new_content }
   end
 end
 
@@ -217,7 +221,7 @@ def push_release_branch(version)
     raise "Creating release branch failed:\n\n#{out}"
   end
 
-  unless (out = `git commit --quiet -m 'Bump version: #{version} [ci skip]' debian/changelog share/github-backup-utils/version bin/ghe-host-check test/testlib.sh`)
+  unless (out = `git commit --quiet -m 'Bump version: #{version} [ci skip]' debian/changelog share/github-backup-utils/version bin/ghe-host-check test/testlib.sh script/cibuild`)
     raise "Error committing changelog and version:\n\n#{out}"
   end