Merge branch 'main' into add-optional-overwrite-input-for-restore

Signed-off-by: Jarek Potiuk <[email protected]>

Author: potiuk

stash/restore/action.yml

@@ -22,8 +22,8 @@ inputs:
       functionality as there is no eviction (only expiry).
 
       The action checks the current branch for a stash, if there is no match,
-      the base branch(PRs)/default branch is searched. If there is more than one
-      match for any branch the most recently updated stash takes precedent.
+      the base branch(PRs)/default branch is searched unless it's specified not to.
+      If there is more than one match for any branch the most recently updated stash takes precedent.
 
       To reduce amount of api calls (1000/h/repo limit) the name of the
       current branch will be appended to the key. Key and branchname will be normalized.
@@ -40,6 +40,11 @@ inputs:
     description: 'Whether the stash_directory should be removed before downloading the stash.'
     default: 'false'
 
+  only-current-branch:
+    description: >
+        If true, only the current branch will be searched for the stash.
+        If false, the base branch(PRs)/default branch branch will be searched as well.
+    default: "false"
 outputs:
   stash-hit:
     description: >
@@ -82,7 +87,7 @@ runs:
         m.output_munged_name(output = 'stash_head')
         m.output_munged_name(ref = 'base_ref', output = 'stash_base')
         with open(os.environ['GITHUB_OUTPUT'], 'a') as f:
-          f.write(f'stash_path={os.path.abspath(os.environ["stash_path"])}' + '\n')
+          f.write(f'stash_path={os.path.abspath(os.path.expanduser(os.environ["stash_path"]))}' + '\n')
 
     - name: Check for stash artifact
       id: check-stash
@@ -98,6 +103,7 @@ runs:
         head_name: "${{ steps.mung.outputs.stash_head }}"
         run_id: "${{ github.run_id }}"
         stash_key: "${{ inputs.key }}"
+        only_current_branch: "${{ inputs.only-current-branch }}"
 
       shell: python3 {0}
       run: |
@@ -116,9 +122,11 @@ runs:
             stash = gs.get_branch_stash(repo, head_name, env("head_ref"), env("head_repo_id"))
 
         if not stash:
-            gs.print_debug(f"Looking for stash {base_name} on base branch.")
-            stash = gs.get_branch_stash(repo, base_name, env("base_ref"), env("base_repo_id"))
-
+            if env("only_current_branch") == "true":
+                print("Skipping base branch search as only-current-branch was set to true.")
+            else:
+                gs.print_debug(f"Looking for stash {base_name} on base branch.")
+                stash = gs.get_branch_stash(repo, base_name, env("base_ref"), env("base_repo_id"))
         gs.print_debug(f"Stash: {stash}")
         if not stash:
             print(f"Stash not found for key: {env('stash_key')}")

stash/save/action.yml

@@ -75,6 +75,11 @@ inputs:
       Default is true to enable updating the stash.
       Only applies within a workflow. Existing stashes are unaffected.
     default: 'true'
+  include-hidden-files:
+    description: >
+      If true, hidden files will be included in the artifact.
+      If false, hidden files will be excluded from the artifact.
+    default: 'false'
 
 outputs:
   stash-id:
@@ -115,11 +120,12 @@ runs:
 
     - name: Upload Stash
       id: upload
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ steps.mung.outputs.stash_name }}
         path: ${{ inputs.path }}
         retention-days: ${{ inputs.retention-days }}
         if-no-files-found: ${{ inputs.if-no-files-found }}
         compression-level: ${{ inputs.compression-level }}
         overwrite: ${{ inputs.overwrite }}
+        include-hidden-files: ${{ inputs.include-hidden-files }}