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

CI: Split paralleltest lint excludes to minimize merge conflicts #5002

Merged
merged 1 commit into from
Jan 11, 2023

Conversation

michaeldiamant
Copy link
Contributor

Splits paralleltest lint excludes into multiple entries to minimize merge conflicts. Functionally, makes no change.

Since the existing path definition is on a single line, it's liable to create merge conflicts when there's concurrent PRs updating paralleltest usage.

I attempted to provide the definition as a multiline yml string via >-, but it didn't work. I found no other workarounds and I'd like to avoid merge conflicts in PRs like #4991, #4992, #4993.

@codecov
Copy link

codecov bot commented Jan 11, 2023

Codecov Report

Merging #5002 (1d193d9) into master (1baa124) will decrease coverage by 0.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #5002      +/-   ##
==========================================
- Coverage   53.65%   53.63%   -0.02%     
==========================================
  Files         432      432              
  Lines       54057    54057              
==========================================
- Hits        29005    28996       -9     
- Misses      22807    22817      +10     
+ Partials     2245     2244       -1     
Impacted Files Coverage Δ
network/netprio.go 69.56% <0.00%> (-8.70%) ⬇️
ledger/roundlru.go 90.56% <0.00%> (-5.67%) ⬇️
ledger/blockqueue.go 85.63% <0.00%> (-2.88%) ⬇️
network/wsPeer.go 66.43% <0.00%> (-1.90%) ⬇️
ledger/tracker.go 74.26% <0.00%> (-0.85%) ⬇️
catchup/service.go 69.80% <0.00%> (-0.73%) ⬇️
ledger/acctonline.go 78.64% <0.00%> (-0.53%) ⬇️
network/wsNetwork.go 64.92% <0.00%> (+0.17%) ⬆️
catchup/peerSelector.go 100.00% <0.00%> (+1.04%) ⬆️
ledger/testing/randomAccounts.go 56.88% <0.00%> (+1.22%) ⬆️
... and 3 more

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

Copy link
Contributor

@algochoi algochoi left a comment

Choose a reason for hiding this comment

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

I'm not aware of style guides on .golangci configs, but the diff looks functionally the same.

@michaeldiamant michaeldiamant merged commit eddf773 into master Jan 11, 2023
@michaeldiamant michaeldiamant deleted the paralleltest_split branch January 11, 2023 16:02
winder pushed a commit to winder/go-algorand that referenced this pull request Jan 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants