Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Gems #390

Closed
wants to merge 3 commits into from
Closed

Update Gems #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e59d4e
Update Gems
chrisballinger Apr 15, 2020
5ff4d3a
Fix JUnit XML path
chrisballinger Apr 15, 2020
d33e3a2
Fix coverage path
chrisballinger Apr 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
when: always
command: |
mkdir -p build/test-results/danger
cp build/BonMot-iOS/scan/BonMot-iOS.test_result/report.junit build/test-results/danger/results.xml
cp build/BonMot-iOS/scan/BonMot-iOS.xcresult/report.junit build/test-results/danger/results.xml
- store_test_results:
path: build/test-results
# Install SwiftLint only before Danger because otherwise it fails the build
Expand Down
4 changes: 2 additions & 2 deletions Dangerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ src_root = File.expand_path('../', __FILE__)

SCHEME = "BonMot-iOS"

result_bundle_path = "#{src_root}/build/#{SCHEME}/scan/#{SCHEME}.test_result-coverage"
result_bundle_path = "#{src_root}/build/#{SCHEME}/scan/#{SCHEME}.xcresult-coverage"
xccoverage_files = Dir.glob("#{result_bundle_path}/**/action.xccovreport").sort_by { |filename| File.mtime(filename) }.reverse
xccov_file_direct_path = xccoverage_files.first

Expand Down Expand Up @@ -80,5 +80,5 @@ end

# Test Reporting

junit.parse "#{src_root}/build/BonMot-iOS/scan/BonMot-iOS.test_result/report.junit"
junit.parse "#{src_root}/build/BonMot-iOS/scan/BonMot-iOS.xcresult/report.junit"
junit.report
70 changes: 45 additions & 25 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,22 @@ GEM
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
aws-eventstream (1.1.0)
aws-partitions (1.296.0)
aws-sdk-core (3.94.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.30.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.61.2)
aws-sdk-core (~> 3, >= 3.83.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.1.1)
aws-eventstream (~> 1.0, >= 1.0.2)
babosa (1.0.3)
circleci (2.0.3)
circleci_artifact (0.1.0)
Expand Down Expand Up @@ -67,14 +83,14 @@ GEM
concurrent-ruby (1.1.6)
cork (0.3.0)
colored2 (~> 3.1)
danger (6.2.0)
danger (6.3.2)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
colored2 (~> 3.1)
cork (~> 0.1)
faraday (~> 0.9)
faraday-http-cache (~> 2.0)
git (~> 1.5)
git (~> 1.6)
kramdown (~> 2.0)
kramdown-parser-gfm (~> 1.0)
no_proxy_fix
Expand All @@ -83,7 +99,7 @@ GEM
danger-junit (1.0.0)
danger (> 2.0)
ox (~> 2.0)
danger-swiftlint (0.24.0)
danger-swiftlint (0.24.2)
danger
rake (> 10)
thor (~> 0.19)
Expand All @@ -92,28 +108,29 @@ GEM
xcov (>= 1.1.2)
declarative (0.0.10)
declarative-option (0.1.0)
digest-crc (0.4.1)
digest-crc (0.5.1)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.7.5)
emoji_regex (1.0.1)
escape (0.0.4)
ethon (0.12.0)
ffi (>= 1.3.0)
excon (0.72.0)
excon (0.73.0)
faraday (0.17.3)
multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4)
http-cookie (~> 1.0.0)
faraday-http-cache (2.0.0)
faraday (~> 0.8)
faraday-http-cache (2.2.0)
faraday (>= 0.8)
faraday_middleware (0.13.1)
faraday (>= 0.7.4, < 1.0)
fastimage (2.1.7)
fastlane (2.141.0)
fastlane (2.145.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.3, < 3.0.0)
aws-sdk-s3 (~> 1.0)
babosa (>= 1.0.2, < 2.0.0)
bundler (>= 1.12.0, < 3.0.0)
colored
Expand Down Expand Up @@ -152,7 +169,8 @@ GEM
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
git (1.5.0)
git (1.6.0)
rchardet (~> 1.8)
google-api-client (0.36.4)
addressable (~> 2.5, >= 2.5.1)
googleauth (~> 0.9)
Expand All @@ -164,29 +182,30 @@ GEM
google-cloud-core (1.5.0)
google-cloud-env (~> 1.0)
google-cloud-errors (~> 1.0)
google-cloud-env (1.3.0)
faraday (~> 0.11)
google-cloud-env (1.3.1)
faraday (>= 0.17.3, < 2.0)
google-cloud-errors (1.0.0)
google-cloud-storage (1.25.1)
google-cloud-storage (1.26.0)
addressable (~> 2.5)
digest-crc (~> 0.4)
google-api-client (~> 0.33)
google-cloud-core (~> 1.2)
googleauth (~> 0.9)
mini_mime (~> 1.0)
googleauth (0.10.0)
faraday (~> 0.12)
googleauth (0.12.0)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (~> 0.12)
signet (~> 0.14)
highline (1.7.10)
http-cookie (1.0.3)
domain_name (~> 0.5)
httpclient (2.8.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jmespath (1.4.0)
json (2.3.0)
jwt (2.1.0)
kramdown (2.1.0)
Expand All @@ -206,17 +225,18 @@ GEM
naturally (2.2.0)
netrc (0.11.0)
no_proxy_fix (0.1.2)
nokogiri (1.10.7)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
octokit (4.15.0)
octokit (4.18.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
open4 (1.3.4)
os (1.0.1)
ox (2.13.1)
os (1.1.0)
ox (2.13.2)
plist (3.5.0)
public_suffix (2.0.5)
rake (13.0.1)
rchardet (1.8.0)
representable (3.0.4)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
Expand All @@ -229,12 +249,12 @@ GEM
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
security (0.1.3)
signet (0.12.0)
signet (0.14.0)
addressable (~> 2.3)
faraday (~> 0.9)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simctl (1.6.7)
simctl (1.6.8)
CFPropertyList
naturally
slack-notifier (2.3.2)
Expand All @@ -250,7 +270,7 @@ GEM
thor (0.20.3)
thread_safe (0.3.6)
tty-cursor (0.7.1)
tty-screen (0.7.0)
tty-screen (0.7.1)
tty-spinner (0.9.3)
tty-cursor (~> 0.7)
typhoeus (1.3.1)
Expand All @@ -260,8 +280,8 @@ GEM
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.6)
unicode-display_width (1.6.1)
unf_ext (0.0.7.7)
unicode-display_width (1.7.0)
word_wrap (1.0.0)
xcodeproj (1.16.0)
CFPropertyList (>= 2.3.3, < 4.0)
Expand Down