Skip to content

chore: merge release/2.28.0 back into develop (post-GA hygiene) - #19326

Merged
erikburt merged 10 commits into
developfrom
chore/merge-release-2.28.0-into-develop
Sep 11, 2025
Merged

erikburt merged 10 commits into
developfrom
chore/merge-release-2.28.0-into-develop

Conversation

@HashWrangler

Copy link
Copy Markdown
Collaborator

This PR merges the release/2.28.0 branch back into develop to keep version history aligned and unblock Go module resolution. No new features, just hygiene after GA.

@github-actions

Copy link
Copy Markdown
Contributor

👋 HashWrangler, thanks for creating this pull request!

To help reviewers, please consider creating future PRs as drafts first. This allows you to self-review and make any final changes before notifying the team.

Once you're ready, you can mark it as "Ready for review" to request feedback. Thanks!

vyzaldysanchez
vyzaldysanchez previously approved these changes Sep 10, 2025
archseer
archseer previously approved these changes Sep 10, 2025
Comment thread deployment/go.mod Resolved
Comment thread core/scripts/go.mod Resolved
- Update deployment/go.mod to use v2.27.3-0.20250908153844-03478edcd69f (from develop)
- Update core/scripts/go.mod to use v2.27.3-0.20250908153844-03478edcd69f (from develop)
- Update deployment version in core/scripts to v0.0.0-20250906212935-a1521d24f47f

This ensures we keep the newer versions from develop rather than downgrading
to older versions from release/2.28.0 during the hygiene merge.
- Update integration-tests/go.mod to use v2.27.3-0.20250908153844-03478edcd69f
- Update integration-tests/load/go.mod to use v2.27.3-0.20250908153844-03478edcd69f
- Update system-tests/lib/go.mod to use v2.27.3-0.20250908153844-03478edcd69f
- Update system-tests/tests/go.mod to use v2.27.3-0.20250908153844-03478edcd69f

This ensures all submodules use the correct newer version from develop
instead of the older version from release/2.28.0, which should resolve
CI failures related to version inconsistencies.
Comment thread core/scripts/go.mod Outdated
github.com/smartcontractkit/chainlink/core/scripts/cre/environment/examples/workflows/v1/proof-of-reserve/cron-based v0.0.0-20250826151008-ae5ec0ee6f2c
github.com/smartcontractkit/chainlink/core/scripts/cre/environment/examples/workflows/v1/proof-of-reserve/web-trigger-based v0.0.0-20250826151008-ae5ec0ee6f2c
github.com/smartcontractkit/chainlink/system-tests/lib v0.0.0-20250908212658-66264730d63f
github.com/smartcontractkit/chainlink/system-tests/lib v0.0.0-20250826151008-ae5ec0ee6f2c

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

This seems to be downgrading the dep's version here as well.

Comment thread system-tests/lib/go.mod Outdated
github.com/smartcontractkit/chainlink-testing-framework/lib v1.54.4
github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.2
github.com/smartcontractkit/chainlink/deployment v0.0.0-20250906212935-a1521d24f47f
github.com/smartcontractkit/chainlink/deployment v0.0.0-20250826151008-ae5ec0ee6f2c

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

(older)

…upgrade

This commit fixes critical version downgrades that were introduced during the merge:

CRITICAL FIXES:
- Restored all go.mod files from develop to prevent version downgrades
- Applied only the chain-selectors upgrade (v1.0.67 → v1.0.70) from release/2.28.0
- Prevented Kubernetes package downgrades (k8s.io/api, apimachinery, client-go)
- Prevented other package downgrades (rs/xid, sigs.k8s.io packages)

VERSION CONSISTENCY:
- All chainlink/v2 references: v2.27.3-0.20250908153844-03478edcd69f (from develop)
- All chain-selectors references: v1.0.70 (from release/2.28.0)
- All go.sum files updated via 'go mod tidy' for consistency

This ensures the PR is strictly hygiene-only with no functional regressions.
All modules verified and consistent across submodules.

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.

Do we need to count this as a change?

@HashWrangler
HashWrangler added this pull request to the merge queue Sep 10, 2025
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Sep 10, 2025
@HashWrangler
HashWrangler added this pull request to the merge queue Sep 10, 2025
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Sep 10, 2025
@cl-sonarqube-production

Copy link
Copy Markdown

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@HashWrangler
HashWrangler added this pull request to the merge queue Sep 11, 2025
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Sep 11, 2025
@erikburt
erikburt added this pull request to the merge queue Sep 11, 2025
Merged via the queue into develop with commit 03bb186 Sep 11, 2025
@erikburt
erikburt deleted the chore/merge-release-2.28.0-into-develop branch September 11, 2025 02:35
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.

6 participants