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

Added save-overrides.toml #438

Merged
merged 19 commits into from
Aug 29, 2022
Merged

Added save-overrides.toml #438

merged 19 commits into from
Aug 29, 2022

Conversation

nulls
Copy link
Member

@nulls nulls commented Aug 25, 2022 •
edited

Supported a new file save-overrides.toml. It has the same structure as save.toml, but we expect it only in root for current run.

Also moved EvaluatedToolConfig to TestConfig

It closes #435

@nulls nulls self-assigned this Aug 25, 2022
github-advanced-security[bot]
github-advanced-security bot found potential problems Aug 25, 2022
View reviewed changes
Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

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

Found 25 potential problems in the proposed changes. Check the Files changed tab for more details.

@github-actions
Copy link

github-actions bot commented Aug 25, 2022 •
edited

JUnit Tests (Linux, EnricoMi/publish-unit-test-result-action@v1)

237 tests  +4   213 ✔️ +4   8m 52s ⏱️ -7s
  48 suites ±0     24 💤 ±0 
  48 files   ±0       0 ❌ ±0 

Results for commit f351e7d. ± Comparison against base commit c1c6eaa.

This pull request removes 12 and adds 16 tests. Note that renamed tests count towards both. 
com.saveourtool.save.core.MergeConfigsTest ‑ merge configs with many parents()[jvm]
com.saveourtool.save.core.MergeConfigsTest ‑ merge configs with many parents[linuxX64]
com.saveourtool.save.core.MergeConfigsTest ‑ merge general configs()[jvm]
com.saveourtool.save.core.MergeConfigsTest ‑ merge general configs[linuxX64]
com.saveourtool.save.core.MergeConfigsTest ‑ merge real toml configs with empty execFlag in child()[jvm]
com.saveourtool.save.core.MergeConfigsTest ‑ merge real toml configs with empty execFlag in child[linuxX64]
com.saveourtool.save.core.MergeConfigsTest ‑ merge two configs with different fields()[jvm]
com.saveourtool.save.core.MergeConfigsTest ‑ merge two configs with different fields[linuxX64]
com.saveourtool.save.core.MergeConfigsTest ‑ merge two incomplete configs 2()[jvm]
com.saveourtool.save.core.MergeConfigsTest ‑ merge two incomplete configs 2[linuxX64]
…

com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ load save toml from middle hierarchy()[jvm]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ load save toml from middle hierarchy[linuxX64]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ merge and override general configs()[jvm]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ merge and override general configs[linuxX64]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ merge and override two configs with different fields()[jvm]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ merge and override two configs with different fields[linuxX64]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ merge and override two incomplete configs 2()[jvm]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ merge and override two incomplete configs 2[linuxX64]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ merge and override two incomplete configs()[jvm]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ merge and override two incomplete configs[linuxX64]
…

♻️ This comment has been updated with latest results.

@github-actions
Copy link

github-actions bot commented Aug 25, 2022 •
edited

JUnit Tests (macOS, EnricoMi/publish-unit-test-result-action@v1)

237 tests  +4   213 ✔️ +4   16m 30s ⏱️ +44s
  48 suites ±0     24 💤 ±0 
  48 files   ±0       0 ❌ ±0 

Results for commit f351e7d. ± Comparison against base commit c1c6eaa.

This pull request removes 12 and adds 16 tests. Note that renamed tests count towards both. 
com.saveourtool.save.core.MergeConfigsTest ‑ merge configs with many parents()[jvm]
com.saveourtool.save.core.MergeConfigsTest ‑ merge configs with many parents[macosX64]
com.saveourtool.save.core.MergeConfigsTest ‑ merge general configs()[jvm]
com.saveourtool.save.core.MergeConfigsTest ‑ merge general configs[macosX64]
com.saveourtool.save.core.MergeConfigsTest ‑ merge real toml configs with empty execFlag in child()[jvm]
com.saveourtool.save.core.MergeConfigsTest ‑ merge real toml configs with empty execFlag in child[macosX64]
com.saveourtool.save.core.MergeConfigsTest ‑ merge two configs with different fields()[jvm]
com.saveourtool.save.core.MergeConfigsTest ‑ merge two configs with different fields[macosX64]
com.saveourtool.save.core.MergeConfigsTest ‑ merge two incomplete configs 2()[jvm]
com.saveourtool.save.core.MergeConfigsTest ‑ merge two incomplete configs 2[macosX64]
…

com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ load save toml from middle hierarchy()[jvm]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ load save toml from middle hierarchy[macosX64]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ merge and override general configs()[jvm]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ merge and override general configs[macosX64]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ merge and override two configs with different fields()[jvm]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ merge and override two configs with different fields[macosX64]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ merge and override two incomplete configs 2()[jvm]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ merge and override two incomplete configs 2[macosX64]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ merge and override two incomplete configs()[jvm]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ merge and override two incomplete configs[macosX64]
…

♻️ This comment has been updated with latest results.

@github-actions
Copy link

github-actions bot commented Aug 25, 2022 •
edited

JUnit Tests (Windows, EnricoMi/publish-unit-test-result-action@v1)

237 tests  +4   213 ✔️ +4   13m 14s ⏱️ + 2m 40s
  48 suites ±0     24 💤 ±0 
  48 files   ±0       0 ❌ ±0 

Results for commit f351e7d. ± Comparison against base commit c1c6eaa.

This pull request removes 12 and adds 16 tests. Note that renamed tests count towards both. 
com.saveourtool.save.core.MergeConfigsTest ‑ merge configs with many parents()[jvm]
com.saveourtool.save.core.MergeConfigsTest ‑ merge configs with many parents[mingwX64]
com.saveourtool.save.core.MergeConfigsTest ‑ merge general configs()[jvm]
com.saveourtool.save.core.MergeConfigsTest ‑ merge general configs[mingwX64]
com.saveourtool.save.core.MergeConfigsTest ‑ merge real toml configs with empty execFlag in child()[jvm]
com.saveourtool.save.core.MergeConfigsTest ‑ merge real toml configs with empty execFlag in child[mingwX64]
com.saveourtool.save.core.MergeConfigsTest ‑ merge two configs with different fields()[jvm]
com.saveourtool.save.core.MergeConfigsTest ‑ merge two configs with different fields[mingwX64]
com.saveourtool.save.core.MergeConfigsTest ‑ merge two incomplete configs 2()[jvm]
com.saveourtool.save.core.MergeConfigsTest ‑ merge two incomplete configs 2[mingwX64]
…

com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ load save toml from middle hierarchy()[jvm]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ load save toml from middle hierarchy[mingwX64]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ merge and override general configs()[jvm]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ merge and override general configs[mingwX64]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ merge and override two configs with different fields()[jvm]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ merge and override two configs with different fields[mingwX64]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ merge and override two incomplete configs 2()[jvm]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ merge and override two incomplete configs 2[mingwX64]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ merge and override two incomplete configs()[jvm]
com.saveourtool.save.core.MergeAndOverrideConfigsTest ‑ merge and override two incomplete configs[mingwX64]
…

♻️ This comment has been updated with latest results.

github-advanced-security[bot]
github-advanced-security bot found potential problems Aug 25, 2022
View reviewed changes
Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

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

Found 43 potential problems in the proposed changes. Check the Files changed tab for more details.

github-advanced-security[bot]
github-advanced-security bot found potential problems Aug 25, 2022
View reviewed changes
Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

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

Found 43 potential problems in the proposed changes. Check the Files changed tab for more details.

github-advanced-security[bot]
github-advanced-security bot found potential problems Aug 25, 2022
View reviewed changes
Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

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

Found 57 potential problems in the proposed changes. Check the Files changed tab for more details.

@codecov
Copy link

codecov bot commented Aug 25, 2022 •
edited

Codecov Report

Merging #438 (f351e7d) into main (c1c6eaa) will decrease coverage by 0.32%.
The diff coverage is 32.80%.

@@             Coverage Diff              @@
##               main     #438      +/-   ##
============================================
- Coverage     46.96%   46.64%   -0.33%     
- Complexity      149      151       +2     
============================================
  Files            52       53       +1     
  Lines          1746     1771      +25     
  Branches        320      331      +11     
============================================
+ Hits            820      826       +6     
- Misses          798      813      +15     
- Partials        128      132       +4
Flag Coverage Δ
unittests 46.64% <32.80%> (-0.33%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...m/saveourtool/save/cli/config/SavePropertiesExt.kt 0.00% <ø> (ø)
...lin/com/saveourtool/save/core/config/TestConfig.kt 5.33% <0.00%> (+0.27%) ⬆️
.../kotlin/com/saveourtool/save/core/plugin/Plugin.kt 0.00% <0.00%> (ø)
...m/saveourtool/save/core/utils/PluginConfigUtils.kt 0.00% <0.00%> (ø)
...com/saveourtool/save/core/utils/ValidationUtils.kt 0.00% <0.00%> (ø)
...n/com/saveourtool/save/core/plugin/PluginConfig.kt 34.32% <16.66%> (+3.89%) ⬆️
...m/saveourtool/save/plugin/warn/WarnPluginConfig.kt 50.00% <57.14%> (-1.86%) ⬇️
...tlin/com/saveourtool/save/plugins/fix/FixPlugin.kt 58.33% <58.33%> (+0.05%) ⬆️
...lin/com/saveourtool/save/plugin/warn/WarnPlugin.kt 59.00% <64.28%> (+0.03%) ⬆️
...NonJsMain/kotlin/com/saveourtool/save/core/Save.kt 63.55% <70.00%> (-1.96%) ⬇️
... and 5 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@nulls nulls marked this pull request as ready for review August 26, 2022 08:13
@nulls nulls enabled auto-merge (squash) August 26, 2022 11:46
@nulls nulls disabled auto-merge August 26, 2022 13:10
@nulls nulls enabled auto-merge (squash) August 29, 2022 08:50
@nulls nulls disabled auto-merge August 29, 2022 09:16
@nulls nulls enabled auto-merge (squash) August 29, 2022 11:10
@nulls nulls merged commit a7809a8 into main Aug 29, 2022
@nulls nulls deleted the feature/save-overrides.toml#435 branch August 29, 2022 11:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kgevorkyan kgevorkyan kgevorkyan left review comments

@petertrr petertrr petertrr approved these changes

@orchestr7 orchestr7 Awaiting requested review from orchestr7

Assignees

@nulls nulls

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Introduce save-overrides.toml
4 participants
@nulls @petertrr @kgevorkyan @orchestr7