File tree Expand file tree Collapse file tree 1 file changed +6
-3
lines changed Expand file tree Collapse file tree 1 file changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -102,18 +102,21 @@ jobs:
102102 git status
103103 done
104104 if ! git diff --cached --quiet; then
105- git commit -m "generate another formats for ${models_list} model(s)"
106105 git status
107106 # Stash any remaining local changes (including untracked files) before pulling
108107 git stash --include-untracked
109108 if git pull --rebase; then
109+ git stash pop || echo "No stashed changes to apply"
110+ git add .
111+ git commit -m "generate another formats for ${models_list} model(s)"
110112 git push
111113 else
112114 echo "Failed to pull --rebase, setting upstream"
115+ git stash pop || echo "No stashed changes to apply"
116+ git add .
117+ git commit -m "generate another formats for ${models_list} model(s)"
113118 git push --set-upstream origin $BRANCH_NAME
114119 fi
115- # Unstash the changes so they're available for the next workflow step
116- git stash pop || echo "No stashed changes to apply"
117120 else
118121 echo "No changes to commit"
119122 fi
You can’t perform that action at this time.
0 commit comments