From 08996545e26a65a3e60385c7453c6851985a2c42 Mon Sep 17 00:00:00 2001 From: Martin Walsh Date: Sun, 24 Nov 2019 19:04:10 +0000 Subject: [PATCH] CI Tweaks --- .circleci/config.yml | 13 ++++++++----- fastlane/Fastfile | 2 +- fastlane/Scanfile | 2 -- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ff05f88b..a6aeda8e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,13 +26,16 @@ jobs: DEVICE: iPhone 8 FASTLANE_EXPLICIT_OPEN_SIMULATOR: 2 - run: | - cd Build/Build/ProfileData + cd ~/Library/Developer/Xcode/DerivedData/ cd $(ls -d */|head -n 1) - directory=${PWD##*/} - pathCoverage=Build/Build/ProfileData/${directory}/Coverage.profdata + directoryBase=${PWD##*/} + cd Build/ProfileData/ + cd $(ls -d */|head -n 1) + directoryCoverage=${PWD##*/} + pathCoverage=${directoryBase}/Build/ProfileData/${directoryCoverage}/Coverage.profdata cd ../../../../ - xcrun llvm-cov export -format="lcov" -instr-profile $pathCoverage Build/Build/Products/Debug-iphonesimulator/standard-swift.app/standard-swift > info.lcov - bash <(curl -s https://codecov.io/bash) + xcrun llvm-cov export -format="lcov" -instr-profile $pathCoverage ${directoryBase}/Build/Products/Debug-iphonesimulator/Auth0.framework/Auth0 > info.lcov + bash <(curl -s https://codecov.io/bash) -J Auth0 - save_cache: key: dependency-cache paths: diff --git a/fastlane/Fastfile b/fastlane/Fastfile index d388dc34..30ac377a 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -35,7 +35,7 @@ platform :ios do device: device, clean: true, skip_build: true, - output_types: 'junit' + code_coverage: true ) end diff --git a/fastlane/Scanfile b/fastlane/Scanfile index ccb22113..6fb8e61c 100644 --- a/fastlane/Scanfile +++ b/fastlane/Scanfile @@ -2,5 +2,3 @@ scheme "Auth0.iOS" devices ["iPhone 8"] clean true - -output_types "html"