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.

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

Update Travis to build xcdiff with Xcode 11.5 #60

Merged
merged 2 commits into from
Jun 22, 2020

Conversation

kwridan
Copy link
Contributor

@kwridan kwridan commented Jun 22, 2020

Describe your changes

  • Updated Travis to build xcdiff using Xcode 11.5
  • Updated the script used by Travis to leverage && between commands to ensure failures are propagated incase one of the commands fails
  • Updated one of the fixtures that was failing CI (due to merge order)

Testing performed
Ran make test

Additional context
This should also switch the macOS version travis uses to Catalina.

- Fixed build scripts to ensure failures are reported incase one of the commands fails
- Updated one of the fixtures that was failing CI (due to merge order)

Test Plan:

- run `make test` verify tests pass
- verify CI passes

Signed-off-by: Kassem Wridan <kwridan@bloomberg.net>
Signed-off-by: Kassem Wridan <kwridan@bloomberg.net>
@codecov
Copy link

codecov bot commented Jun 22, 2020

Codecov Report

Merging #60 into master will increase coverage by 0.29%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master      #60      +/-   ##
==========================================
+ Coverage   95.82%   96.12%   +0.29%     
==========================================
  Files          43       43              
  Lines        1486     1598     +112     
==========================================
+ Hits         1424     1536     +112     
  Misses         62       62              
Impacted Files Coverage Δ
Sources/XCDiffCore/ProjectComparator.swift 100.00% <ø> (ø)
Sources/XCDiffCommand/CommandRunner.swift 95.49% <100.00%> (+0.03%) ⬆️
...ultRenderer/TextProjectCompareResultRenderer.swift 100.00% <100.00%> (ø)
...Core/ResultRenderer/Renderer/ConsoleRenderer.swift 100.00% <100.00%> (ø)
...iffCore/ResultRenderer/Renderer/HTMLRenderer.swift 100.00% <100.00%> (ø)
...ore/ResultRenderer/Renderer/MarkdownRenderer.swift 100.00% <100.00%> (ø)
...fCore/ResultRenderer/UniversalResultRenderer.swift 100.00% <100.00%> (ø)
...rces/XCDiffCore/Comparator/HeadersComparator.swift 100.00% <0.00%> (ø)
...rces/XCDiffCore/Comparator/SourcesComparator.swift 100.00% <0.00%> (ø)
... and 13 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6ceb728...d5a9e7a. Read the comment docs.

Copy link
Contributor

@marciniwanicki marciniwanicki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@kwridan kwridan merged commit 4656838 into bloomberg:master Jun 22, 2020
@kwridan kwridan deleted the feature/update-ci branch June 22, 2020 14:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants