Skip to content

Fix/ci #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Dec 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
osx_image: xcode9.3
osx_image: xcode10.2
language: objective-c
cache:
- cocoapods
- bundler
gemfile: test/Gemfile
before_install:
- gem install cocoapods
- unset CPATH
install:
- bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
- bundle exec pod setup
script:
- rake install
- cd test
Expand Down
2 changes: 1 addition & 1 deletion cocoapods-binary.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
spec.add_dependency "fourflusher", "~> 2.0"
spec.add_dependency "xcpretty", "~> 0.3.0"

spec.add_development_dependency 'bundler', '~> 1.3'
spec.add_development_dependency 'bundler', '> 1.3'
spec.add_development_dependency 'rake'
end
4 changes: 2 additions & 2 deletions test/change_podfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def addSwiftPod():
"""
keep_source_code_for_prebuilt_frameworks!

pod "RxCocoa", :binary => true
pod "RxCocoa", "~> 4.0", :binary => true
pod "Literal", :binary => true
"""),
"""
Expand All @@ -70,7 +70,7 @@ def revertToSourceCode():
"""
keep_source_code_for_prebuilt_frameworks!

pod "RxCocoa", :binary => true
pod "RxCocoa", "~> 4.0", :binary => true
pod "Literal"
"""),
"""
Expand Down
2 changes: 1 addition & 1 deletion test/test.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
set -e
set -ex

build() {
xcodebuild -workspace Binary.xcworkspace -scheme Binary ONLY_ACTIVE_ARCH=YES CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO -quiet || exit 1
Expand Down