lysann/passforios
1
0
Fork 0
Code Issues Pull requests Activity

Fix last commit

Browse source
This commit is contained in:
Yishi Lin 2017-03-31 03:16:54 +08:00
parent d28dde8719
commit 5de66ad17a
2 changed files with 0 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -1,12 +1,8 @@
language: objective-c language: objective-c
<<<<<<< HEAD
osx_image: xcode8.3 osx_image: xcode8.3
branches: branches:
only: only:
- develop - develop
=======
osx_image: xcode8.2
>>>>>>> uiimprovement
before_install: before_install:
- echo -e "machine github.com\n login $GITHUB_ACCESS_TOKEN" >> ~/.netrc - echo -e "machine github.com\n login $GITHUB_ACCESS_TOKEN" >> ~/.netrc
script: script:

9
fastlane/Fastfile
View file

@ -52,22 +52,13 @@ platform :ios do
keychain_password: ENV["MATCH_KEYCHAIN_PASSWORD"], keychain_password: ENV["MATCH_KEYCHAIN_PASSWORD"],
readonly: true readonly: true
) )
<<<<<<< HEAD
# ensure_git_status_clean # ensure_git_status_clean
=======
ensure_git_status_clean
>>>>>>> uiimprovement
increment_build_number( increment_build_number(
build_number: latest_testflight_build_number + 1, build_number: latest_testflight_build_number + 1,
xcodeproj: "pass.xcodeproj" xcodeproj: "pass.xcodeproj"
) )
<<<<<<< HEAD
# commit_version_bump(xcodeproj: "pass.xcodeproj") # commit_version_bump(xcodeproj: "pass.xcodeproj")
# push_to_git_remote # push_to_git_remote
=======
commit_version_bump(xcodeproj: "pass.xcodeproj")
push_to_git_remote(local_branch: "develop")
>>>>>>> uiimprovement
gym(scheme: "pass") gym(scheme: "pass")
pilot(skip_waiting_for_build_processing: true) pilot(skip_waiting_for_build_processing: true)
mailgun( mailgun(