Merge pull request #53 from mackerelio/bump-version-0.10.0

Release version 0.10.0
mackerelio · May 10, 2016 · 23c80a9 · 23c80a9
2 parents 6d286fb + 1dbb527
commit 23c80a9
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ go:
 env:
   global:
   - PATH=~/bin:~/gopath/bin:$PATH
-  - secure: Ffv0t508yBkuWsee2mRAE3ngW7BoOJ9hSvRDCmfNbvINO+u81SrqKBmsXRY3ip0pZxFkf0842WYG1ZdPes74YZUKCcrDp4MwcAKkMaNX8iYiRfFDtGSvMfHRrHzTb+QsiCeuEsMKCllqO6Vpqfb+ZlZ8VfvZYm4vOx4mR76dX4GYR6Ze60ac+6RRAeqQxe1q8/96kvyNmVuHLxuGTPSyCOe3rnHxcfdQHJcJt7GThI8/tZbSyl65u7p1/TDnfIwFjrrFcNsdPrp45fYO6Z8e1hxH8bdn6O5pGrmvpIB5Ykx6eupP6I4tpRp6z8t7gMlanGJNLAzgarr509bAE/zzeD2Y8KE38vlT9LgBzy1r4gyMaCMn5CNXaDgBEXTD2Ufnn+pSl495QCz4Ux5x/1jwA1q5hDVMZvJ0FZJBZzSwOwgQTGewoyE0smoOG5SgKvy/NZUce6xZ2fDKl7gC/80NBHXszNiq5wneJD855z05WgbhwX036ctgsm+xdO8eWxp8PzP+dmKUMXUtv6sAPgd6qkmOMpfU+OHYEK/IKNIcDnqJXWO+/CLWcUEQltuCBVU5anhIYgMbjwGDch6kpWYm+k/ySsG7C7Dr1pmDvFtwkZap3otUc78Oi6afC7155o3TweNb0YjAXtDlP+mbopeL3/ekOa/RKc5V0Qatq4jYouk=
+  - secure: "jHn0J9ELpBEK7pLhJDNVZa8SWD2LSx4Spxm1bVu1yZzrVwOSUuNU9iJ25/RkPN+0+KK53K5rwIisXtWGU4AM49vx7CA3kMMbqJd6X4DfzT0ZEK8dZiQX6m/YbZfVQSOPsMOYQryoH4q0hPru5UR6oDhxsyxBBerL/LzPczI+AS4="
 install:
 - go get github.com/laher/goxc
 - sudo apt-get update

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.10.0 (2016-05-10)
+
+* support `isMute` field of monitors #49 (Songmu)
+* support boolean at isEmpty #51 (stanaka)
+* bump up go version to 1.6.2 #52 (stanaka)
+
+
 ## 0.9.1 (2016-03-25)
 
 * use GOARCH=amd64 for now #41 (Songmu)

diff --git a/packaging/deb/debian/changelog b/packaging/deb/debian/changelog
@@ -1,3 +1,14 @@
+mkr (0.10.0-1) stable; urgency=low
+
+  * support `isMute` field of monitors (by Songmu)
+    <https://github.com/mackerelio/mkr/pull/49>
+  * support boolean at isEmpty (by stanaka)
+    <https://github.com/mackerelio/mkr/pull/51>
+  * bump up go version to 1.6.2 (by stanaka)
+    <https://github.com/mackerelio/mkr/pull/52>
+
+ -- mackerel <mackerel-developers@hatena.ne.jp>  Tue, 10 May 2016 06:59:45 +0000
+
 mkr (0.9.1-1) stable; urgency=low
 
   * use GOARCH=amd64 for now (by Songmu)

diff --git a/packaging/rpm/mkr.spec b/packaging/rpm/mkr.spec
@@ -42,6 +42,11 @@ rm -f %{buildroot}%{_bindir}/${name}
 %{_localbindir}/%{name}
 
 %changelog
+* Tue May 10 2016 <mackerel-developers@hatena.ne.jp> - 0.10.0-1
+- support `isMute` field of monitors (by Songmu)
+- support boolean at isEmpty (by stanaka)
+- bump up go version to 1.6.2 (by stanaka)
+
 * Fri Mar 25 2016 <y.songmu@gmail.com> - 0.9.1-1
 - use GOARCH=amd64 for now (by Songmu)
 

diff --git a/script/releng b/script/releng
@@ -129,7 +129,7 @@ sub github_release_with_exit_code {
 
 sub http_get {
     my $url = shift;
-    my ($ok, $err, undef, $stdout) = run(command => [qw{curl -sf}, $url]);
+    my ($ok, $err, undef, $stdout, $stderr) = run(command => [qw{curl -sf}, $url]);
     return {
         success => $ok,
         content => join('', @$stdout),
@@ -247,7 +247,7 @@ sub merged_prs {
     say "Pull Requests: " . join(", ", @pull_nums);
     my @releases;
     for my $pull_num (@pull_nums) {
-        my $url = sprintf "https://api.github.com/repos/%s/pulls/%d?state=closed", $REPO_NAME, $pull_num;
+        my $url = sprintf "https://api.github.com/repos/%s/pulls/%d", $REPO_NAME, $pull_num;
         my $res = http_get($url);
         unless ($res->{success}) {
             warnf "request to $url failed\n";
@@ -403,7 +403,7 @@ sub create_pull_request {
     }
 
     # return if last commit is updating specs and changelogs
-    my $last_commitlog = `git log -1 --oneline | cut -d ' ' -f2-`;
+    my $last_commitlog = `git log --oneline master..HEAD | cut -d ' ' -f2-`;
     if($last_commitlog =~ /update changelogs/){
         infof "skip to update changelogs because the last commit is 'update changelogs'.\n";
         return;
@@ -418,10 +418,10 @@ sub create_pull_request {
         infof "skip to update changelogs because no merged pull request is found after the last release.\n"
     }
     if($ret || git_with_exit_code qw/diff --exit-code/){
-        git qw/commit -am/, "update changelogs";
         git qw/config --global push.default matching/;
         git qw/config user.email/, 'mackerel-developers@hatena.ne.jp';
         git qw/config user.name/, 'mackerel';
+        git qw/commit -am/, "update changelogs";
         git qw/push -u/, "https://$ENV{GITHUB_TOKEN}\@github.com/$REPO_NAME.git";
         infof "Difference is pushed to GitHub.\n";
     }