Skip to content

Commit

Permalink
revert ci
Browse files Browse the repository at this point in the history
  • Loading branch information
man.li committed Mar 14, 2018
1 parent d6b443a commit a98a55f
Show file tree
Hide file tree
Showing 7 changed files with 60 additions and 66 deletions.
6 changes: 6 additions & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
coverage:
status:
patch: on

ignore:
- Tests/**/*
73 changes: 21 additions & 52 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@

# Created by https://www.gitignore.io/api/swift,objective-c

### Objective-C ###
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated
build/
DerivedData/
*.DS_Store
.idea

## Various settings
*.pbxuser
Expand All @@ -23,54 +21,14 @@ xcuserdata/

## Other
*.moved-aside
*.xccheckout
*.xcscmblueprint
*.xcuserstate

## Obj-C/Swift specific
*.hmap
*.ipa
*.dSYM.zip
*.dSYM

# CocoaPods - Refactored to standalone file


# Carthage - Refactored to standalone file

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/#source-control

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output

# Code Injection
#
# After new code Injection tools there's a generated folder /iOSInjectionProject
# https://github.com/johnno1962/injectionforxcode

iOSInjectionProject/

### Objective-C Patch ###

### Swift ###
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated

## Various settings

## Other

## Obj-C/Swift specific

## Playgrounds
timeline.xctimeline
playground.xcworkspace
Expand All @@ -79,20 +37,31 @@ playground.xcworkspace
#
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
# Package.pins
.build/

# CocoaPods - Refactored to standalone file
# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
Pods/

# Carthage - Refactored to standalone file
# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts

Carthage/Build

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/#source-control

# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md


# End of https://www.gitignore.io/api/swift,objective-c
fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
4 changes: 4 additions & 0 deletions .slather.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
coverage_service: coveralls
xcodeproj: Example_Swift.xcodeproj
source_directory: Example_Swift
scheme: Example_Swift
20 changes: 13 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
os: osx
language: objective-c
sudo: required
dist: trusty
osx_image: xcode9.2
script:
#- eval "$(curl -sL https://raw.githubusercontent.com/DotzuX/Swift-CI/master/ci)"
- eval "$(curl -sL https://raw.githubusercontent.com/DotzuX/Swift-CI/master/codecov)"
language: objective-c
xcode_project: Example_Swift.xcodeproj
xcode_scheme: Example_Swift
xcode_sdk: iphonesimulator
script: ./build.sh

before_install:
- gem i slather --no-ri --no-rdoc
- brew update
- brew uninstall xctool; brew install xctool --HEAD;
after_success:
- bash <(curl -s https://codecov.io/bash)
- slather
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'slather'
13 changes: 13 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#! /bin/bash

BUILD_CMD="xcodebuild -project Example_Swift.xcodeproj -scheme Example_Swift -sdk iphonesimulator build"

which -s xcpretty
XCPRETTY_INSTALLED=$?

if [[ $TRAVIS || $XCPRETTY_INSTALLED == 0 ]]; then
eval "${BUILD_CMD} | xcpretty"
else
eval "$BUILD_CMD"
fi

7 changes: 0 additions & 7 deletions codecov.yml

This file was deleted.

0 comments on commit a98a55f

Please sign in to comment.