Skip to content

Commit

Permalink
fix ci and re-tag
Browse files Browse the repository at this point in the history
  • Loading branch information
keefertaylor committed Nov 3, 2019
1 parent 5535f7d commit d0540c6
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
17 changes: 10 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,31 @@ before_install:

jobs:
include:
- stage: Build - Swift Package Manager
script:
- swift test
- stage: Build - CocoaPods
install:
- brew outdated cocoapods || brew upgrade cocoapods
- brew outdated cocoapods || brew upgrade cocoapods
script:
- pod lib lint
- stage: Build - Carthage And Code Coverage
install:
- brew outdated carthage || brew upgrade carthage
- brew outdated carthage || brew upgrade carthage
- brew install xcodegen
- gem install slather
- gem install slather
script:
# Carthage requires that XCode project files are checked in. Project.yml is
# the canonical definition for the .xcodeproj file. Remove the .xcodeproj file
# and regenerate it.
# and regenerate it.
# See: https://github.com/Carthage/Carthage/issues/2684
- rm -rf Base58Swift.xcodeproj
- xcodegen generate

# Build with Carthage
- travis_wait 500 carthage bootstrap --platform iOS --no-use-binaries --verbose
- set -o pipefail && xcodebuild test -scheme Base58Swift_iOS -destination 'platform=iOS Simulator,name=iPhone XS,OS=12.2' ONLY_ACTIVE_ARCH=YES | xcpretty

# Generate and Upload Code Coverage
- slather
- bash <(curl -s https://codecov.io/bash)
Expand All @@ -53,11 +56,11 @@ jobs:

# Carthage requires that XCode project files are checked in. Project.yml is
# the canonical definition for the .xcodeproj file. Remove the .xcodeproj file
# and regenerate it.
# and regenerate it.
# See: https://github.com/Carthage/Carthage/issues/2684
- rm -rf Base58Swift.xcodeproj
- xcodegen generate

- carthage build --no-skip-current --platform iOS,mac --cache-builds
- carthage archive $FRAMEWORK_NAME
deploy:
Expand Down
4 changes: 2 additions & 2 deletions Base58Swift.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Base58Swift"
s.version = "2.1.5"
s.version = "2.1.6"
s.summary = "A pure swift implementation of base58 string encoding and decoding."
s.description = <<-DESC
A pure swift implementation of base58 string encoding and decoding. Based off of https://github.com/jbenet/go-base58.
Expand All @@ -9,7 +9,7 @@ Pod::Spec.new do |s|
s.homepage = "https://github.com/keefertaylor/Base58Swift"
s.license = { :type => "MIT", :file => "LICENSE" }
s.author = { "Keefer Taylor" => "[email protected]" }
s.source = { :git => "https://github.com/keefertaylor/Base58Swift.git", :tag => "2.1.5" }
s.source = { :git => "https://github.com/keefertaylor/Base58Swift.git", :tag => "2.1.6" }
s.source_files = "Base58Swift/*.swift"
s.swift_version = "4.2"
s.ios.deployment_target = "8.0"
Expand Down

0 comments on commit d0540c6

Please sign in to comment.