Skip to content

Fix Conan cache restore isolation#1610

Merged
sre-ci-robot merged 1 commit intozilliztech:mainfrom
jamesgao-jpg:fix/gha-conan-cache-isolation
Apr 30, 2026
Merged

Fix Conan cache restore isolation#1610
sre-ci-robot merged 1 commit intozilliztech:mainfrom
jamesgao-jpg:fix/gha-conan-cache-isolation

Conversation

@jamesgao-jpg
Copy link
Copy Markdown
Collaborator

What

This PR makes the GitHub Actions Conan cache restore safer on self-hosted runners.

It was prompted by PR #1609, whose Unit Test run restored a stale main Conan cache via the broad restore-keys prefix and then failed with a Conan package directory collision.

Changes:

  • remove Conan restore-keys so a changed conanfile.py no longer falls back to an older Conan cache
  • remove ~/.conan2/p before restoring the Conan cache so persistent runner leftovers cannot collide with restored Conan metadata
  • keep ccache restore behavior unchanged

Verification

Ran locally:

  • git diff --check
  • structural check confirming the reset step exists and the Conan cache block has no restore-keys
  • python3 YAML parse of .github/actions/cache-restore/action.yaml

Note: full validation requires a GitHub Actions run on the self-hosted runner.

Clear Conan package storage before restoring actions/cache so self-hosted runner leftovers cannot collide with restored cache metadata.

Drop broad Conan restore-key fallback so dependency changes do not borrow stale caches from main or older PR keys.

Signed-off-by: jamesgao-jpg <james.gao@zilliz.com>
@mergify
Copy link
Copy Markdown

mergify Bot commented Apr 30, 2026

@jamesgao-jpg 🔍 Important: PR Classification Needed!

For efficient project management and a seamless review process, it's essential to classify your PR correctly. Here's how:

  1. If you're fixing a bug, label it as kind/bug.
  2. For small tweaks (less than 20 lines without altering any functionality), please use kind/improvement.
  3. Significant changes that don't modify existing functionalities should be tagged as kind/enhancement.
  4. Adjusting APIs or changing functionality? Go with kind/feature.

For any PR outside the kind/improvement category, ensure you link to the associated issue using the format: “issue: #”.

Thanks for your efforts and contribution to the community!.

Copy link
Copy Markdown
Collaborator

@foxspy foxspy left a comment

Choose a reason for hiding this comment

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

/lgtm

@alexanderguzhva
Copy link
Copy Markdown
Collaborator

this is part of #1608 process
issue: #1608
/kind improvement

@alexanderguzhva
Copy link
Copy Markdown
Collaborator

/lgtm

@alexanderguzhva
Copy link
Copy Markdown
Collaborator

/approve

@sre-ci-robot
Copy link
Copy Markdown
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alexanderguzhva, foxspy, jamesgao-jpg

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [alexanderguzhva,foxspy]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@mergify mergify Bot added the ci-passed label Apr 30, 2026
@sre-ci-robot sre-ci-robot merged commit d957a9a into zilliztech:main Apr 30, 2026
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants