Skip to content

Merge main into develop-google-adk#1769

Merged
TimPansino merged 23 commits into
develop-google-adkfrom
merge-main-develop-google-adk
Jun 25, 2026
Merged

Merge main into develop-google-adk#1769
TimPansino merged 23 commits into
develop-google-adkfrom
merge-main-develop-google-adk

Conversation

@TimPansino

Copy link
Copy Markdown
Contributor

Overview

Merges main into develop-google-adk

TimPansino and others added 14 commits June 9, 2026 17:18
* Add main filter to PR CI image builds

* Add github CI image cleanup job

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* Add repo-level CLAUDE.md

* Small edits

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* Move firestore to non-hacky solution

* Codify rediscluster setup and build at runtime

* [MegaLinter] Apply linters fixes

* Fix redis cluster networking

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* New testing utils

* Anthropic token counting

* Add error message for token counting failures
Bumps the github_actions group with 1 update: [dataaxiom/ghcr-cleanup-action](https://github.com/dataaxiom/ghcr-cleanup-action).


Updates `dataaxiom/ghcr-cleanup-action` from 1.0.16 to 1.2.2
- [Release notes](https://github.com/dataaxiom/ghcr-cleanup-action/releases)
- [Commits](dataaxiom/ghcr-cleanup-action@cd0cdb9...d52806a)

---
updated-dependencies:
- dependency-name: dataaxiom/ghcr-cleanup-action
  dependency-version: 1.2.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github_actions
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@TimPansino TimPansino requested a review from a team as a code owner June 16, 2026 19:09
@TimPansino TimPansino changed the base branch from main to develop-google-adk June 16, 2026 19:09
@TimPansino TimPansino changed the title Merge main into develop-google-adk [DO NOT MERGE] Merge main into develop-google-adk Jun 16, 2026
@github-actions

github-actions Bot commented Jun 16, 2026

Copy link
Copy Markdown

MegaLinter analysis: Success

Descriptor Linter Files Fixed Errors Warnings Elapsed time
✅ ACTION actionlint 9 0 0 1.0s
✅ MARKDOWN markdownlint 7 0 0 0 1.52s
✅ PYTHON ruff 1047 0 0 0 1.08s
✅ PYTHON ruff-format 1047 0 0 0 0.4s
✅ YAML prettier 23 0 0 0 1.7s
✅ YAML v8r 23 0 0 7.22s
✅ YAML yamllint 23 0 0 0.8s

Notices

📣 MegaLinter 9.5.0 is out! Discover the new features and security recommendations in the release announcement. (Skip this info by defining SECURITY_SUGGESTIONS: false)

See detailed reports in MegaLinter artifacts

MegaLinter is graciously provided by OX Security
Show us your support by starring ⭐ the repository

@mergify mergify Bot added the tests-failing Tests failing in CI. label Jun 16, 2026
@codecov-commenter

codecov-commenter commented Jun 16, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 82.90598% with 40 lines in your changes missing coverage. Please review.
⚠️ Please upload report for BASE (develop-google-adk@8c23641). Learn more about missing BASE report.

Files with missing lines Patch % Lines
newrelic/hooks/external_botocore.py 87.40% 0 Missing and 16 partials ⚠️
newrelic/hooks/mlmodel_gemini.py 73.33% 4 Missing and 8 partials ⚠️
newrelic/hooks/mlmodel_anthropic.py 68.75% 4 Missing and 6 partials ⚠️
newrelic/hooks/mlmodel_openai.py 93.33% 0 Missing and 2 partials ⚠️
Additional details and impacted files
@@                  Coverage Diff                  @@
##             develop-google-adk    #1769   +/-   ##
=====================================================
  Coverage                      ?   82.04%           
=====================================================
  Files                         ?      216           
  Lines                         ?    26774           
  Branches                      ?     4235           
=====================================================
  Hits                          ?    21967           
  Misses                        ?     3343           
  Partials                      ?     1464           

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

hmstepanek and others added 7 commits June 17, 2026 08:59
* New testing utils

* Bedrock token counting

* Add better guards to bedrock token counting

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
…#1772)

Bumps the github_actions group with 1 update: [actions/checkout](https://github.com/actions/checkout).


Updates `actions/checkout` from 6.0.3 to 7.0.0
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@df4cb1c...9c091bb)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 7.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github_actions
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Delete old replay files

* Replace Gemini test setup with VCR

* Improve behavior of Gemini tests

* Add additional logic to VCR setup

* Record new Gemini responses with VCR

* Improved megalinter filtering

* User helper to drop recorded headers

* Clean up comment

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
@TimPansino TimPansino force-pushed the merge-main-develop-google-adk branch from a0b0f30 to e50f96b Compare June 24, 2026 22:48
@TimPansino TimPansino changed the title [DO NOT MERGE] Merge main into develop-google-adk Merge main into develop-google-adk Jun 24, 2026
@TimPansino TimPansino enabled auto-merge June 24, 2026 22:49
@mergify mergify Bot removed the tests-failing Tests failing in CI. label Jun 25, 2026
@TimPansino TimPansino merged commit 9e70fd8 into develop-google-adk Jun 25, 2026
106 of 108 checks passed
@TimPansino TimPansino deleted the merge-main-develop-google-adk branch June 25, 2026 20:41
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.

5 participants