Skip to content

ref(git hooks): Only suggest autoupdate variable when pulling if not already set #45179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 28, 2023
Merged

ref(git hooks): Only suggest autoupdate variable when pulling if not already set #45179

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e2e513
improve logging when updating after pull
lobsterkatie Feb 28, 2023
9ead788
autoformat
lobsterkatie Feb 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions config/hooks/post-merge
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,29 @@ reset="$(tput sgr0)"
files_changed_upstream="$(mktemp)"
trap "rm -f ${files_changed_upstream}" EXIT

git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD > "$files_changed_upstream"
git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD >"$files_changed_upstream"

grep --quiet 'requirements-dev-frozen.txt' "$files_changed_upstream" && py="install-py-dev "
grep --quiet 'yarn.lock' "$files_changed_upstream" && js="install-js-dev "
grep --quiet 'migrations' "$files_changed_upstream" && migrations="apply-migrations "
grep --quiet 'yarn.lock' "$files_changed_upstream" && js="install-js-dev "
grep --quiet 'migrations' "$files_changed_upstream" && migrations="apply-migrations "

[[ "$pc" || "$py" || "$js" || "$migrations" ]] && needs_update=1
update_command="make ${pc}${py}${js}${migrations}"

[[ "$needs_update" ]] && cat <<EOF
if [[ "$needs_update" ]]; then
update_command="make ${pc}${py}${js}${migrations}"

cat <<EOF

[${red}${bold}!!!${reset}] ${red} It looks like some dependencies have changed that will require your intervention. Run the following to update:${reset}

${red}${bold}${update_command}${reset}

${yellow}If you want these commands to automatically be executed after pulling code you can export the SENTRY_POST_MERGE_AUTO_UPDATE variable.${reset}

EOF

if [[ "$SENTRY_POST_MERGE_AUTO_UPDATE" && "$needs_update" ]]; then
$update_command
if [[ "$SENTRY_POST_MERGE_AUTO_UPDATE" ]]; then
echo "${yellow}Automatically running update command because SENTRY_POST_MERGE_AUTO_UPDATE is set.${reset}"
$update_command
else
echo "${yellow}If you want these commands to be executed automatically after pulling code, you can export the SENTRY_POST_MERGE_AUTO_UPDATE variable.${reset}"
fi
fi