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

Upstream 2.10-rc3 merge #688

Merged
merged 3 commits into from
Apr 5, 2024
Merged

Upstream 2.10-rc3 merge #688

merged 3 commits into from
Apr 5, 2024

Conversation

mateusz-sekara
Copy link
Contributor

Motivation

Solution

Copy link
Contributor

github-actions bot commented Apr 5, 2024

I see you updated files related to core. Please run pnpm changeset to add a changeset.

Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think these need to be added right?

Copy link
Contributor Author

@mateusz-sekara mateusz-sekara Apr 5, 2024

Choose a reason for hiding this comment

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

Hmm, dunno, this is exactly what was committed in Core repo
https://github.com/smartcontractkit/chainlink/blob/develop/core/web/assets/main.4a9b933093bb165fcc8f.js

If it shouldn't be there, let them fix in the upstream instead of removing it manually from our repo

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah I just saw that. I don't think it affects the build process so should be fine.

@makramkd
Copy link
Contributor

makramkd commented Apr 5, 2024

Looks like the upstream PR included some unnecessary files smartcontractkit/chainlink#12684

@mateusz-sekara mateusz-sekara requested a review from makramkd April 5, 2024 07:17
@mateusz-sekara mateusz-sekara merged commit d59dba0 into ccip-develop Apr 5, 2024
76 of 78 checks passed
@mateusz-sekara mateusz-sekara deleted the chainlink-2.10 branch April 5, 2024 07:58
@mateusz-sekara mateusz-sekara changed the title Upstream 2.10-rc2 merge Upstream 2.10-rc3 merge Apr 5, 2024
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.

3 participants