chore: Cherry-picked changes from upstream

README.md

@@ -92,8 +92,8 @@ Have a look under [Advanced Configuration](#advanced-configuration) for detailed
     # Whether to restore the cache if found
     restore-cache: "true"
 
-    # Whether to save the cache after the run
-    save-cache: "true"
+    # Whether to save the cache after the run: true, false, or auto (disabled for merge_group events)
+    save-cache: "auto"
 
     # Suffix for the cache key
     cache-suffix: ""
@@ -159,7 +159,7 @@ python 3.13
 ```
 
 ```yaml
-- uses: step-security/setup-uv@v9
+- uses: step-security/setup-uv@v10
   with:
     version-file: ".tool-versions"
 ```

__tests__/utils/inputs.test.ts

@@ -206,6 +206,51 @@ describe("loadInputs", () => {
     expect(inputs.enableCache).toBe(true);
   });
 
+  it("restores but does not save cache automatically for merge groups", () => {
+    mockInputs["working-directory"] = "/workspace";
+    mockInputs["enable-cache"] = "auto";
+    mockInputs["restore-cache"] = "true";
+    mockInputs["save-cache"] = "auto";
+    process.env.RUNNER_ENVIRONMENT = "github-hosted";
+    process.env.RUNNER_TEMP = "/runner-temp";
+    process.env.GITHUB_EVENT_NAME = "merge_group";
+
+    const inputs = loadInputs();
+
+    expect(inputs.enableCache).toBe(true);
+    expect(inputs.restoreCache).toBe(true);
+    expect(inputs.saveCache).toBe(false);
+    expect(mockInfo).toHaveBeenCalledWith(
+      "Cache saving is disabled for the merge_group event",
+    );
+  });
+
+  it.each([
+    ["true", true],
+    ["false", false],
+  ])("honors save-cache %s for merge groups", (saveCacheInput, expected) => {
+    mockInputs["working-directory"] = "/workspace";
+    mockInputs["save-cache"] = saveCacheInput;
+    process.env.GITHUB_EVENT_NAME = "merge_group";
+
+    const inputs = loadInputs();
+
+    expect(inputs.saveCache).toBe(expected);
+    expect(mockInfo).not.toHaveBeenCalledWith(
+      "Cache saving is disabled for the merge_group event",
+    );
+  });
+
+  it("automatically saves cache for other events", () => {
+    mockInputs["working-directory"] = "/workspace";
+    mockInputs["save-cache"] = "auto";
+    process.env.GITHUB_EVENT_NAME = "push";
+
+    const inputs = loadInputs();
+
+    expect(inputs.saveCache).toBe(true);
+  });
+
   it("uses cache-dir from pyproject.toml when present", () => {
     mockInputs["working-directory"] = createTempProject({
       "pyproject.toml": `[project]

action-types.yml

@@ -33,7 +33,11 @@ inputs:
   restore-cache:
     type: boolean
   save-cache:
-    type: boolean
+    type: enum
+    allowed-values:
+      - "true"
+      - "false"
+      - auto
   cache-suffix:
     type: string
   cache-local-path:

action.yml

@@ -51,8 +51,8 @@ inputs:
     description: "Whether to restore the cache if found."
     default: "true"
   save-cache:
-    description: "Whether to save the cache after the run."
-    default: "true"
+    description: "Whether to save the cache after the run. 'auto' disables saving for merge_group events."
+    default: "auto"
   cache-suffix:
     description: "Suffix for the cache key"
     required: false

biome.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.5.8/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.5.9/schema.json",
   "assist": {
     "actions": {
       "source": {