Skip to content

Commit 6a4665e

Browse files
authored
[CI] Do a rebase pull when updating the repo cache (#18523)
We don't want to try to make a merge commit. Signed-off-by: Sarnie, Nick <nick.sarnie@intel.com>
1 parent d6b3ff2 commit 6a4665e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

devops/actions/cached_checkout/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ runs:
3131
mkdir -p ${{ inputs.cache_path }}/${{ inputs.repository }}
3232
cd ${{ inputs.cache_path }}/${{ inputs.repository }}
3333
if [ -d ./.git ]; then
34-
git pull --prune
34+
git pull --prune --rebase
3535
else
3636
git clone https://github.com/${{ inputs.repository }}.git .
3737
git gc

0 commit comments

Comments
 (0)