Skip to content

Sync precommit config from main - #7732

Merged
DaanHoogland merged 2 commits into
apache:4.18from
shapeblue:update-precommit-config
Jul 7, 2023
Merged

Sync precommit config from main#7732
DaanHoogland merged 2 commits into
apache:4.18from
shapeblue:update-precommit-config

Conversation

@vishesh92

@vishesh92 vishesh92 commented Jul 7, 2023 •
edited
Loading

Copy link
Copy Markdown
Member

Description

This PR syncs the pre-commit config from main branch. As of now forward merging of 4.18 to main is causing lint checks to fail for main.

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

jbampton and others added 2 commits July 7, 2023 12:30
@vishesh92 vishesh92 added complexity:trivial 10 minnutes to a few days at most component:ci-cd labels Jul 7, 2023
@vishesh92
vishesh92 changed the base branch from 4.18 to main July 7, 2023 07:55
@vishesh92
vishesh92 changed the base branch from main to 4.18 July 7, 2023 07:56
DaanHoogland
DaanHoogland approved these changes Jul 7, 2023
View reviewed changes

@DaanHoogland DaanHoogland left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

clgtm, a lot of conflicts will arise in PRs (and some in merge forward ) but better than all the conflicts on merge forward per PR :|

@vishesh92

vishesh92 commented Jul 7, 2023

Copy link
Copy Markdown
Member Author

List of files with conflicts while merging with main
image

@DaanHoogland

DaanHoogland commented Jul 7, 2023

Copy link
Copy Markdown
Contributor

@weizhouapache can you agree with this?

@weizhouapache

weizhouapache commented Jul 7, 2023

Copy link
Copy Markdown
Member

@weizhouapache can you agree with this?

@DaanHoogland
yes, looks good

harikrishna-patnala
harikrishna-patnala approved these changes Jul 7, 2023
View reviewed changes

@harikrishna-patnala harikrishna-patnala left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

code LGTM

@DaanHoogland DaanHoogland mentioned this pull request Jul 7, 2023
Merged
12 tasks
@DaanHoogland
DaanHoogland merged commit 594c70d into apache:4.18 Jul 7, 2023
@DaanHoogland
DaanHoogland deleted the update-precommit-config branch September 29, 2023 12:38
@DaanHoogland DaanHoogland added this to the 4.18.1.0 milestone Sep 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@DaanHoogland DaanHoogland DaanHoogland approved these changes
@harikrishna-patnala harikrishna-patnala harikrishna-patnala approved these changes
@weizhouapache weizhouapache weizhouapache approved these changes

Assignees

No one assigned

Labels

complexity:trivial 10 minnutes to a few days at most component:api component:ci-cd component:networking

Projects

None yet

Milestone

4.18.1.0

Development

Successfully merging this pull request may close these issues.

5 participants

@vishesh92 @DaanHoogland @weizhouapache @harikrishna-patnala @jbampton