Skip to content

Skip saving cache for merge_group event #812

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
Merged
eregon merged 1 commit into from
Dec 20, 2025
Merged

Skip saving cache for merge_group event #812

eregon merged 1 commit into from
Dec 20, 2025

Conversation

@ntkme
Copy link
Contributor

@ntkme ntkme commented Sep 30, 2025

Note, I did not do yarn update in order to keep the lockfile change small. This has introduced some transitive dependencies at different versions. One of the maintainers should probably do a dependency update at some point.

@ntkme ntkme force-pushed the merge-group branch 3 times, most recently from f2dda73 to 4f93b7d Compare October 8, 2025 16:42
@ntkme
Copy link
Contributor Author

ntkme commented Dec 20, 2025

@eregon Would you mind take a look and see if this makes sense?

In #805 we have a user complaining that merge_group (merge queue) events are saving cache, but those cache will never have any chance to be read again. In a large repository, this can consume lots of cache space on GitHub to the point it is purging older cache aggressively, and significantly reduce overall cache hit rate.

eregon
eregon reviewed Dec 20, 2025
View reviewed changes
bundler.js Outdated
// @actions/cache only allows to save for non-existing keys
if (!common.isExactCacheKeyMatch(key, cachedKey)) {
// Also, skip saving cache for merge_group event
if (!common.isExactCacheKeyMatch(key, cachedKey) && github.context.eventName !== 'merge_group') {
Copy link
Member

@eregon eregon Dec 20, 2025

Choose a reason for hiding this comment

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

How about reading from $GITHUB_EVENT_NAME? That would avoid 4k lines and many packages in dist/index.js just for this check

Copy link
Member

@eregon eregon Dec 20, 2025

Choose a reason for hiding this comment

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

It's documented in https://docs.github.com/en/actions/reference/workflows-and-actions/variables

Copy link
Contributor Author

@ntkme ntkme Dec 20, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Good idea. I didn't thought about that. One small concern is that github.context.eventName is immutable, but $GITHUB_EVENT_NAME is mutable. At least in here there is no point to abuse this difference, so it's not a problem.

Copy link
Member

@eregon eregon Dec 20, 2025

Choose a reason for hiding this comment

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

I would think github.context.eventName is initialized from the env var anyway so probably not safer in practice, unless the current process sets that env var (not the case).

eregon
eregon reviewed Dec 20, 2025
View reviewed changes
Copy link
Member

@eregon eregon left a comment

Choose a reason for hiding this comment

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

Thanks, looks good but let's use the env var to avoid pulling a bunch of dependencies we don't need.

@ntkme ntkme requested a review from eregon December 20, 2025 16:42
@eregon eregon merged commit d354de1 into ruby:master Dec 20, 2025
209 checks passed
@ntkme ntkme deleted the merge-group branch December 20, 2025 20:37
mergify bot added a commit to robfrank/linklift that referenced this pull request Dec 22, 2025
@mergify
chore(deps): bump the github-actions group with 3 updates [skip ci]
09d6134 
[//]: # (dependabot-start)
⚠️ \*\*Dependabot is rebasing this PR\*\* ⚠️
Rebasing might not happen immediately, so don't worry if this takes some time.
Note: if you make any changes to this PR yourself, they will take precedence over the rebase.
---
[//]: # (dependabot-end)
Bumps the github-actions group with 3 updates: [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action), [github/codeql-action](https://github.com/github/codeql-action) and [ruby/setup-ruby](https://github.com/ruby/setup-ruby).
Updates `docker/setup-buildx-action` from 3.11.1 to 3.12.0
Release notes

*Sourced from [docker/setup-buildx-action's releases](https://github.com/docker/setup-buildx-action/releases).*

> v3.12.0
> -------
>
> * Deprecate `install` input by [`@​crazy-max`](https://github.com/crazy-max) in [docker/setup-buildx-action#455](https://redirect.github.com/docker/setup-buildx-action/pull/455)
> * Bump `@​docker/actions-toolkit` from 0.62.1 to 0.63.0 in [docker/setup-buildx-action#434](https://redirect.github.com/docker/setup-buildx-action/pull/434)
> * Bump brace-expansion from 1.1.11 to 1.1.12 in [docker/setup-buildx-action#436](https://redirect.github.com/docker/setup-buildx-action/pull/436)
> * Bump form-data from 2.5.1 to 2.5.5 in [docker/setup-buildx-action#432](https://redirect.github.com/docker/setup-buildx-action/pull/432)
> * Bump undici from 5.28.4 to 5.29.0 in [docker/setup-buildx-action#435](https://redirect.github.com/docker/setup-buildx-action/pull/435)
>
> **Full Changelog**: <docker/setup-buildx-action@v3.11.1...v3.12.0>


Commits

* [`8d2750c`](docker/setup-buildx-action@8d2750c) Merge pull request [#455](https://redirect.github.com/docker/setup-buildx-action/issues/455) from crazy-max/install-deprecated
* [`e81846b`](docker/setup-buildx-action@e81846b) deprecate install input
* [`65d18f8`](docker/setup-buildx-action@65d18f8) Merge pull request [#454](https://redirect.github.com/docker/setup-buildx-action/issues/454) from docker/dependabot/github\_actions/actions/checkout-6
* [`000d75d`](docker/setup-buildx-action@000d75d) build(deps): bump actions/checkout from 5 to 6
* [`1583c0f`](docker/setup-buildx-action@1583c0f) Merge pull request [#443](https://redirect.github.com/docker/setup-buildx-action/issues/443) from nicolasleger/patch-1
* [`ed158e7`](docker/setup-buildx-action@ed158e7) doc: bump actions/checkout from 4 to 5
* [`4cc794f`](docker/setup-buildx-action@4cc794f) Merge pull request [#441](https://redirect.github.com/docker/setup-buildx-action/issues/441) from docker/dependabot/github\_actions/actions/checkout-5
* [`4dfc3d6`](docker/setup-buildx-action@4dfc3d6) build(deps): bump actions/checkout from 4 to 5
* [`af1b253`](docker/setup-buildx-action@af1b253) Merge pull request [#440](https://redirect.github.com/docker/setup-buildx-action/issues/440) from crazy-max/k3s-build
* [`3c6ab92`](docker/setup-buildx-action@3c6ab92) ci: k3s test with latest buildx
* Additional commits viewable in [compare view](docker/setup-buildx-action@e468171...8d2750c)
  
Updates `github/codeql-action` from 4.31.8 to 4.31.9
Release notes

*Sourced from [github/codeql-action's releases](https://github.com/github/codeql-action/releases).*

> v4.31.9
> -------
>
> CodeQL Action Changelog
> =======================
>
> See the [releases page](https://github.com/github/codeql-action/releases) for the relevant changes to the CodeQL CLI and language packs.
>
> 4.31.9 - 16 Dec 2025
> --------------------
>
> No user facing changes.
>
> See the full [CHANGELOG.md](https://github.com/github/codeql-action/blob/v4.31.9/CHANGELOG.md) for more information.


Changelog

*Sourced from [github/codeql-action's changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md).*

> CodeQL Action Changelog
> =======================
>
> See the [releases page](https://github.com/github/codeql-action/releases) for the relevant changes to the CodeQL CLI and language packs.
>
> [UNRELEASED]
> ------------
>
> No user facing changes.
>
> 4.31.9 - 16 Dec 2025
> --------------------
>
> No user facing changes.
>
> 4.31.8 - 11 Dec 2025
> --------------------
>
> * Update default CodeQL bundle version to 2.23.8. [#3354](https://redirect.github.com/github/codeql-action/pull/3354)
>
> 4.31.7 - 05 Dec 2025
> --------------------
>
> * Update default CodeQL bundle version to 2.23.7. [#3343](https://redirect.github.com/github/codeql-action/pull/3343)
>
> 4.31.6 - 01 Dec 2025
> --------------------
>
> No user facing changes.
>
> 4.31.5 - 24 Nov 2025
> --------------------
>
> * Update default CodeQL bundle version to 2.23.6. [#3321](https://redirect.github.com/github/codeql-action/pull/3321)
>
> 4.31.4 - 18 Nov 2025
> --------------------
>
> No user facing changes.
>
> 4.31.3 - 13 Nov 2025
> --------------------
>
> * CodeQL Action v3 will be deprecated in December 2026. The Action now logs a warning for customers who are running v3 but could be running v4. For more information, see [Upcoming deprecation of CodeQL Action v3](https://github.blog/changelog/2025-10-28-upcoming-deprecation-of-codeql-action-v3/).
> * Update default CodeQL bundle version to 2.23.5. [#3288](https://redirect.github.com/github/codeql-action/pull/3288)
>
> 4.31.2 - 30 Oct 2025
> --------------------
>
> No user facing changes.
>
> 4.31.1 - 30 Oct 2025
> --------------------
>
> * The `add-snippets` input has been removed from the `analyze` action. This input has been deprecated since CodeQL Action 3.26.4 in August 2024 when this removal was announced.
>
> 4.31.0 - 24 Oct 2025
> --------------------
>
> * Bump minimum CodeQL bundle version to 2.17.6. [#3223](https://redirect.github.com/github/codeql-action/pull/3223)
> * When SARIF files are uploaded by the `analyze` or `upload-sarif` actions, the CodeQL Action automatically performs post-processing steps to prepare the data for the upload. Previously, these post-processing steps were only performed before an upload took place. We are now changing this so that the post-processing steps will always be performed, even when the SARIF files are not uploaded. This does not change anything for the `upload-sarif` action. For `analyze`, this may affect Advanced Setup for CodeQL users who specify a value other than `always` for the `upload` input. [#3222](https://redirect.github.com/github/codeql-action/pull/3222)

... (truncated)


Commits

* [`5d4e8d1`](github/codeql-action@5d4e8d1) Merge pull request [#3371](https://redirect.github.com/github/codeql-action/issues/3371) from github/update-v4.31.9-998798e34
* [`1dc115f`](github/codeql-action@1dc115f) Update changelog for v4.31.9
* [`998798e`](github/codeql-action@998798e) Merge pull request [#3352](https://redirect.github.com/github/codeql-action/issues/3352) from github/nickrolfe/jar-min-ff-cleanup
* [`5eb7519`](github/codeql-action@5eb7519) Merge pull request [#3358](https://redirect.github.com/github/codeql-action/issues/3358) from github/henrymercer/database-upload-telemetry
* [`d29eddb`](github/codeql-action@d29eddb) Extract version number to constant
* [`e962687`](github/codeql-action@e962687) Merge branch 'main' into henrymercer/database-upload-telemetry
* [`19c7f96`](github/codeql-action@19c7f96) Rename `isOverlayBase`
* [`ae5de9a`](github/codeql-action@ae5de9a) Use `getErrorMessage` in log too
* [`0cb8633`](github/codeql-action@0cb8633) Prefer `performance.now()`
* [`c07cc0d`](github/codeql-action@c07cc0d) Merge pull request [#3351](https://redirect.github.com/github/codeql-action/issues/3351) from github/henrymercer/ghec-dr-determine-tools-vers...
* Additional commits viewable in [compare view](github/codeql-action@1b168cd...5d4e8d1)
  
Updates `ruby/setup-ruby` from 1.270.0 to 1.275.0
Release notes

*Sourced from [ruby/setup-ruby's releases](https://github.com/ruby/setup-ruby/releases).*

> v1.275.0
> --------
>
> What's Changed
> --------------
>
> * Skip saving cache for merge\_group event by [`@​ntkme`](https://github.com/ntkme) in [ruby/setup-ruby#812](https://redirect.github.com/ruby/setup-ruby/pull/812)
>
> **Full Changelog**: <ruby/setup-ruby@v1.274.0...v1.275.0>
>
> v1.274.0
> --------
>
> What's Changed
> --------------
>
> * Fix rubyinstaller2 urls for latest release by [`@​zenspider`](https://github.com/zenspider) in [ruby/setup-ruby#842](https://redirect.github.com/ruby/setup-ruby/pull/842)
>
> New Contributors
> ----------------
>
> * [`@​zenspider`](https://github.com/zenspider) made their first contribution in [ruby/setup-ruby#842](https://redirect.github.com/ruby/setup-ruby/pull/842)
>
> **Full Changelog**: <ruby/setup-ruby@v1.273.0...v1.274.0>
>
> v1.273.0
> --------
>
> What's Changed
> --------------
>
> * Update CRuby releases on Windows by [`@​ruby-builder-bot`](https://github.com/ruby-builder-bot) in [ruby/setup-ruby#840](https://redirect.github.com/ruby/setup-ruby/pull/840)
>
> **Full Changelog**: <ruby/setup-ruby@v1.272.0...v1.273.0>
>
> v1.272.0
> --------
>
> What's Changed
> --------------
>
> * Add ruby-4.0.0-preview3 by [`@​ruby-builder-bot`](https://github.com/ruby-builder-bot) in [ruby/setup-ruby#839](https://redirect.github.com/ruby/setup-ruby/pull/839)
>
> **Full Changelog**: <ruby/setup-ruby@v1.271.0...v1.272.0>
>
> v1.271.0
> --------
>
> What's Changed
> --------------
>
> * Add ruby-3.4.8 by [`@​ruby-builder-bot`](https://github.com/ruby-builder-bot) in [ruby/setup-ruby#838](https://redirect.github.com/ruby/setup-ruby/pull/838)
>
> **Full Changelog**: <ruby/setup-ruby@v1.270.0...v1.271.0>


Commits

* [`d354de1`](ruby/setup-ruby@d354de1) Skip saving cache for merge\_group event
* [`ed55d55`](ruby/setup-ruby@ed55d55) Fix rubyinstaller2 urls for latest release
* [`a25f1e4`](ruby/setup-ruby@a25f1e4) Update CRuby releases on Windows
* [`211ffaa`](ruby/setup-ruby@211ffaa) Add ruby-4.0.0-preview3
* [`f8d7259`](ruby/setup-ruby@f8d7259) Add ruby-3.4.8
* See full diff in [compare view](ruby/setup-ruby@ac793fd...d354de1)
  
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
  
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot show  ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore  major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself)
- `@dependabot ignore  minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself)
- `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself)
- `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency
- `@dependabot unignore  ` will remove the ignore condition of the specified dependency and ignore conditions
@claude claude bot mentioned this pull request Dec 22, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@eregon eregon eregon approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Provide ability to restore from cache but NOT save cache

2 participants

@ntkme @eregon