Skip to content

Downmerge main to dev after script updates#60

Merged
emdobrin merged 1 commit intodev-v3.0.4from
main
Mar 12, 2022
Merged

Downmerge main to dev after script updates#60
emdobrin merged 1 commit intodev-v3.0.4from
main

Conversation

@kevinlind
Copy link
Copy Markdown
Contributor

@kevinlind kevinlind commented Feb 15, 2022

Scripts were updated directly to Main. Downmerge changes to dev.

  • Remove SwiftFormat from project.
    As SwiftFormat is not automatically installed like SwiftLint is, customers can get build failures.

  • Add required 'getHistoricalEvents' method to TestableExtensionRuntime

  • Remove leading whitespace from run script.

  • Update CircleCI Xcode image to 12.0.1

  • Remove SwiftFormat

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • I have signed the Adobe Open Source CLA.
  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@kevinlind
Fix run script to remove SwiftFormat (#59)
1a14741 
* Remove SwiftFormat from project.
As SwiftFormat is not automatically installed like SwiftLint is, customers can get build failures.

* Add required 'getHistoricalEvents' method to TestableExtensionRuntime

* Remove leading whitespace from run script.

* Update CircleCI Xcode image to 12.0.1

* Remove SwiftFormat
@kevinlind kevinlind requested a review from emdobrin February 15, 2022 18:27
@codecov
Copy link
Copy Markdown

codecov bot commented Feb 15, 2022

Codecov Report

Merging #60 (1a14741) into dev-v3.0.4 (d202c74) will decrease coverage by 34.01%.
The diff coverage is n/a.

@@               Coverage Diff               @@
##           dev-v3.0.4      #60       +/-   ##
===============================================
- Coverage       89.93%   55.92%   -34.01%     
===============================================
  Files              13       14        +1     
  Lines            1082     1107       +25     
===============================================
- Hits              973      619      -354     
- Misses            109      488      +379

@emdobrin
Copy link
Copy Markdown
Contributor

emdobrin commented Feb 17, 2022

@kevinlind do you know why the coverage dropped to 55%?

@kevinlind
Copy link
Copy Markdown
Contributor Author

kevinlind commented Feb 18, 2022

@kevinlind do you know why the coverage dropped to 55%?

No, I haven't figured this out yet. From the percentage, it looks like it's only counting the unit test coverage and ignoring the functional test coverage. I did notice the Xcode project did not have coverage enabled for the AEPAnalytics or AEPAnalyticsFunctionalTests schemes, but that didn't make a difference when enabling coverage in Xcode and kicking a build.
I don't see any errors in the build for the Codecov step. The Codecov logs do state it found and uploaded the coverage reports for AEPAnalytics, AEPAnalyticsUnitTests, and AEPAnalyticsFunctionalTests. However, in Codecov, the build logs show the source files from the functional tests all with line coverage of 0.

https://codecov.io/api/gh/adobe/aepsdk-analytics-ios/download/build?path=v4/raw/2022-02-15/4D7DD0C282C336E085570C6546B826B8/3b4fe70f862c62db9da5129626359d7535173191/7743c041-b260-4dca-9225-79130977d96f.txt

@emdobrin
Copy link
Copy Markdown
Contributor

emdobrin commented Mar 12, 2022

Coverage to be fixed in #63, merging.

@emdobrin emdobrin merged commit 6fe0b88 into dev-v3.0.4 Mar 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@emdobrin emdobrin Awaiting requested review from emdobrin

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@kevinlind @emdobrin