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

Fix additional merge conflicts in develop #8764

Merged
merged 27 commits into from
Mar 21, 2023
Merged

Fix additional merge conflicts in develop #8764

merged 27 commits into from
Mar 21, 2023

Conversation

chainchad
Copy link
Collaborator

@chainchad chainchad commented Mar 20, 2023 •
edited
Loading

The conflicts were in

	both modified:   docs/CHANGELOG.md
	both modified:   integration-tests/smoke/vrfv2_test.go

prashantkumar1982 and others added 26 commits March 17, 2023 06:29
@prashantkumar1982
Remove alexroan from CODEOWNERS (#8735)
ae8bda1
@jmank88
legacy config cleanup (#8738)
2c3e993
@krehermann @jmank88
update wsrpc version to take race fixes (#8743)
8ffaa3d 
Co-authored-by: Jordan Krage <jmank88@gmail.com>
@tateexon
Dynamically Use Solana Version Based on Go Mod (#8745)
f7a4302 
* dynamically get the sha

* pull the full sha
@krehermann
BCF-2000 skip unnecessary config (#8711)
fd5a79e
@prashantkumar1982 @jmank88
Introduce a chain agnostic Head interface in the core Transaction Man…
22d682f 
…ager (#8674)

Co-authored-by: Jordan Krage <jmank88@gmail.com>
@austinborn @samsondav
Add Feed ID index to Verifier (#8746)
b7a61bd 
* Add Feed ID index to Verifier

* Generate contracts

---------

Co-authored-by: Sam <samsondav@protonmail.com>
@dependabot
Bump actions/checkout from 3.3.0 to 3.4.0 (#8716)
f2b10ae 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump smartcontractkit/chainlink-github-actions from 2.1.2 to 2.1.3 (#…
c1ab774 
…8690)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@tateexon
The if statements are incorrect now that we aren't always using the c…
1ad6bea 
…ached version (#8753)
@dependabot
Bump peter-evans/create-pull-request from 4.2.3 to 4.2.4 (#8717)
d6bee4e 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @jmank88
Bump github/codeql-action from 2.2.6 to 2.2.7 (#8714)
bdf2f4c 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jordan Krage <jmank88@gmail.com>
@dependabot @jmank88
Bump actions/setup-go from 3 to 4 (#8715)
afcfbf1 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jordan Krage <jmank88@gmail.com>
@jmank88
.github/workflows: fix clean and sonar job names (#8752)
1506f53
@jmank88
bump pyroscope, sentry, color (#8749)
5d4cf76
@george-dorin
Set node name as JAID to prevent overwrite (#8737)
8ef12e1
@essamhassan
Integrate Gas estimators healthcheck in txmgr (#8726)
988b0fe
@essamhassan
Remove references for healthy calls in relayer ifaces (#8755)
e2d01b5
@jmank88
remove config mutations; clean up interfaces (#8751)
35f0790
@gheorghestrimtu
TT-181 use GetTestLogger from CTF (#8756)
05408e5
@george-dorin
Move Enhanced EA telemetry protobuf to own file (#8741)
ef7ab92
@krehermann
remove codecgen from .tool-versions (#8729)
3435ac6 
* Remove codecgen from .tool-versions
@anirudhwarrier
AUTO-2156 Cleanup automation integration tests contracts (#8754)
5fca3c6
@andrevmatos @connorwstein
LogPoller - support downstream testing (#8648)
46e4008 
Co-authored-by: connorwstein <connor.stein@mail.mcgill.ca>
@RyanRHall @cmalec
Automation registry 2.0.2 (#8419)
e18eb45 
* write automation registry 2_0_2

* use failure mode enum in tests

* expose revert bytes in checkUpkeep

* rename PaymentModel --> Mode

* use Mode enum in tests

* upgrade ArbSys to nitro version

* improve error message in keeper registry test

* make keeper registry use L2 blocknum/blockhash on arbitrum

* early return instead of revert on stale report

* add PerformDataWrapper to user custom revert bytes

* fix misplaced comment in keeper registry test

* update _blockHash function to pre-check block range

* update go wrappers for automation 2.0.2

---------

Co-authored-by: Chris Malec <cmalec@users.noreply.github.com>
@chainchad
Merge branch 'develop' into chore/release-1.13.0-develop-conflicts-3
c750964
@chainchad chainchad requested review from a team, javuto and jkongie as code owners March 20, 2023 19:04
samsondav
samsondav reviewed Mar 20, 2023
View reviewed changes
Copy link
Collaborator

@samsondav samsondav left a comment

Choose a reason for hiding this comment

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

This has 10k changed lines, definitely not a merge conflict fix. Something else has happened here

@chainchad
Copy link
Collaborator Author

This has 10k changed lines, definitely not a merge conflict fix. Something else has happened here

This branch was cut from the release/1.13.0 and then develop was merged in to it. Here's a more readable diff:

develop...chore/release-1.13.0-develop-conflicts-3

@cl-sonarqube-production
Copy link

SonarQube Quality Gate

Quality Gate failed

Failed condition 49.2% 49.2% Coverage on New Code (is less than 90%)

See analysis details on SonarQube

@chainchad chainchad merged commit 2fe34b5 into release/1.13.0 Mar 21, 2023
@chainchad chainchad deleted the chore/release-1.13.0-develop-conflicts-3 branch March 21, 2023 11:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@samsondav samsondav samsondav left review comments

@jmank88 jmank88 jmank88 approved these changes

@javuto javuto Awaiting requested review from javuto javuto is a code owner

@jkongie jkongie Awaiting requested review from jkongie jkongie is a code owner

@se3000 se3000 Awaiting requested review from se3000 se3000 is a code owner

@connorwstein connorwstein Awaiting requested review from connorwstein connorwstein is a code owner

@prashantkumar1982 prashantkumar1982 Awaiting requested review from prashantkumar1982 prashantkumar1982 is a code owner

@pinebit pinebit Awaiting requested review from pinebit

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.