Skip to content

Commit

Permalink
small fix
Browse files Browse the repository at this point in the history
  • Loading branch information
djbe committed Feb 19, 2017
1 parent 18262e8 commit 08a440b
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
def xcpretty(cmd, name)
name = name.gsub(/:/,"_")

This comment has been minimized.

Copy link
@AliSoftware

AliSoftware Feb 19, 2017

Contributor

You should apply the same for plain

This comment has been minimized.

Copy link
@djbe

djbe Feb 19, 2017

Author Member

gah, I'm doing that, then going to sleep.

if ENV['CI']
sh "set -o pipefail && #{cmd} | tee \"#{ENV['CIRCLE_ARTIFACTS']}/#{name}_raw.log\" | xcpretty --color --report junit --output \"#{ENV['CIRCLE_TEST_REPORTS']}/xcode/#{name}.xml\""
elsif `which xcpretty` && $?.success?
Expand All @@ -19,24 +20,24 @@ end
namespace :spm do
desc 'Build using SPM'
task :build do
plain("swift build", "spm_build")
plain("swift build", "spm:build")
end

desc 'Run SPM Unit Tests'
task :test => :build do
plain("swift test", "spm_build")
plain("swift test", "spm:test")
end
end

namespace :xcode do
desc 'Build using Xcode'
task :build do
xcpretty("xcodebuild -workspace StencilSwiftKit.xcworkspace -scheme Tests build-for-testing", "xcode_build")
xcpretty("xcodebuild -workspace StencilSwiftKit.xcworkspace -scheme Tests build-for-testing", "xcode:build")
end

desc 'Run Xcode Unit Tests'
task :test => :build do
xcpretty("xcodebuild -workspace StencilSwiftKit.xcworkspace -scheme Tests test-without-building", "xcode_test")
xcpretty("xcodebuild -workspace StencilSwiftKit.xcworkspace -scheme Tests test-without-building", "xcode:test")
end
end

Expand Down

0 comments on commit 08a440b

Please sign in to comment.