Skip to content

Commit

Permalink
move the git pull to after we push the post install cmd
Browse files Browse the repository at this point in the history
i think this isn't actually getting pushed
  • Loading branch information
jazzsequence committed Sep 22, 2023
1 parent 150670b commit 4c5d379
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions private/scripts/helpers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -396,8 +396,7 @@ function update_composer() {
git add composer.json
git commit -m "[Sage Install] Add post-install-cmd hook to also run install on ${sagename}"

git pull --ff --commit
if ! git push origin master; then
if ! git push origin master; then+
echo "${red}Push failed. Stopping here.${normal}"
echo "Next steps are to push the changes to the repo and then set the connection mode back to Git."
exit 1;
Expand All @@ -424,6 +423,8 @@ function update_composer() {
echo "${yellow}Workflow still running, waiting another ${waittime} seconds.${normal}"
terminus workflow:wait --max="$waittime" "$sitename"."$siteenv"
fi

git pull --ff --commit
}

# Finish up the Sage install process.
Expand Down

0 comments on commit 4c5d379

Please sign in to comment.