瀏覽代碼

Use ruby instead jq to parse JSON to pick current branch

kishikawa katsumi 9 年之前
父節點
當前提交
f355fb99aa
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 0 1
      .travis.yml
  2. 2 1
      Lib/Rakefile

+ 0 - 1
.travis.yml

@@ -6,7 +6,6 @@ cache:
 before_install:
   - brew update
   - brew outdated carthage || brew upgrade carthage
-  - brew install jq
 install:
   - "(cd Lib && bundle install --path=vendor/bundle --binstubs=vendor/bin)"
 before_script:

+ 2 - 1
Lib/Rakefile

@@ -1,4 +1,5 @@
 require 'xcjobs'
+require 'json'
 
 def destinations(platform: 'iphonesimulator')
   if platform == 'iphonesimulator'
@@ -71,7 +72,7 @@ namespace :build do
     if ENV['CI']
       pull_req = %[https://api.github.com/repos/#{ENV['TRAVIS_REPO_SLUG']}/pulls/#{ENV['TRAVIS_PULL_REQUEST']}]
       auth_token = 'kishikawakatsumi:209558699492df7782fbe62dda1891d6a6ba010f'
-      (ENV['TRAVIS_PULL_REQUEST'] == 'false' ? ENV['TRAVIS_BRANCH'] : `curl -u #{auth_token} -s #{pull_req} | jq -r .head.ref`).strip
+      (ENV['TRAVIS_PULL_REQUEST'] == 'false' ? ENV['TRAVIS_BRANCH'] : JSON.parse(`curl -u #{auth_token} -s #{pull_req}`)['head']['ref']).strip
     else
       %x[git rev-parse --abbrev-ref HEAD]
     end