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

Fix local files with extends #2236

Merged
merged 3 commits into from
Jan 8, 2023

Conversation

bdovaz
Copy link
Collaborator

@bdovaz bdovaz commented Jan 8, 2023

This PR #2151 that I made was not right and we didn't realize it because we didn't have tests.

In this PR I add the fix and the tests

@nvuillam check me the tests in case you see that they can be done better because my experience with python is not much and I don't know if the way to build the workspace value is the best.

@bdovaz bdovaz requested a review from nvuillam as a code owner January 8, 2023 16:10
@nvuillam
Copy link
Member

nvuillam commented Jan 8, 2023

@bdovaz tips here about quick build and TEST_KEYWORDS, that can dramatically improve CI jobs time when you update just python or doc :) (works only for main repo, not forks)

https://megalinter.io/latest/contributing/#cictcd

image

About the last bullet, for a PR like that I'll merge without requiring it :)

@codecov-commenter
Copy link

Codecov Report

Merging #2236 (6641977) into main (13b0e44) will increase coverage by 0.14%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main    #2236      +/-   ##
==========================================
+ Coverage   82.48%   82.62%   +0.14%     
==========================================
  Files         170      170              
  Lines        4470     4484      +14     
==========================================
+ Hits         3687     3705      +18     
+ Misses        783      779       -4     
Impacted Files Coverage Δ
megalinter/config.py 92.30% <100.00%> (+2.56%) ⬆️
megalinter/tests/test_megalinter/config_test.py 100.00% <100.00%> (ø)
megalinter/reporters/UpdatedSourcesReporter.py 89.74% <0.00%> (+2.56%) ⬆️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@bdovaz
Copy link
Collaborator Author

bdovaz commented Jan 8, 2023

Thanks @nvuillam

By the way, checks validated!

Copy link
Member

@nvuillam nvuillam left a comment

Choose a reason for hiding this comment

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

Good catch and good fix :)

@nvuillam nvuillam merged commit 841b135 into oxsecurity:main Jan 8, 2023
@bdovaz bdovaz deleted the fix/local-files-with-extends branch January 8, 2023 18:07
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

3 participants