Commit 693b7f81 authored by Samuel Giddins's avatar Samuel Giddins Committed by GitHub

Merge pull request #4687 from CocoaPods/seg-ruby-2.3

[Travis] Add Ruby 2.3 to matrix
parents 2839f842 51d09bbf
...@@ -9,6 +9,7 @@ rvm: ...@@ -9,6 +9,7 @@ rvm:
# OS X 10.9.0-10.9.2 # OS X 10.9.0-10.9.2
# TODO: currently unavailable: https://github.com/travis-ci/travis-ci/issues/2918 # TODO: currently unavailable: https://github.com/travis-ci/travis-ci/issues/2918
# - 2.0.0-p247 # - 2.0.0-p247
- 2.3.1
branches: branches:
only: only:
......
...@@ -91,6 +91,18 @@ CLIntegracon.configure do |c| ...@@ -91,6 +91,18 @@ CLIntegracon.configure do |c|
path.open('w') { |f| f << Pod::YAMLHelper.convert_hash(yaml, keys_hint, "\n\n") } path.open('w') { |f| f << Pod::YAMLHelper.convert_hash(yaml, keys_hint, "\n\n") }
end end
c.preprocess('**/*.xcodeproj', %r{(^|/)(Podfile|Manifest).lock$}) do |path|
keys_hint = if path.extname == '.lock'
Pod::Lockfile::HASH_KEY_ORDER
end
contents = path.read
if contents.strip.empty?
contents
else
Pod::YAMLHelper.convert_hash(YAML.load(contents), keys_hint, "\n\n")
end
end
# So we don't need to compare them directly # So we don't need to compare them directly
c.ignores 'Podfile' c.ignores 'Podfile'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment