Skip to content

Conversation

@lobsterkatie
Copy link
Member

This PR refactors the post-merge git hook so that it not longer suggests setting SENTRY_POST_MERGE_AUTO_UPDATE if it's already set. Instead, it prints a message confirming that it's running the auto-update because it's detected the variable.

image

It also:

  • gathers all of the update logic inside a single if [[ "$needs_update" ]] block
  • fixes two spacing issues the auto-formatter didn't like

@lobsterkatie lobsterkatie requested a review from a team as a code owner February 28, 2023 02:26
@github-actions github-actions bot added the Scope: Backend Automatically applied to PRs that change backend components label Feb 28, 2023
@asottile-sentry
Copy link
Contributor

the original behaviour is kind of nice because if it fails I can copy paste the commands to rerun it

@lobsterkatie
Copy link
Member Author

the original behaviour is kind of nice because if it fails I can copy paste the commands to rerun it

Perhaps I'm misunderstanding you, but the original commands are still there. It's just that instead of saying "hey, FYI, you can set this env var" in the case where you already have it set, it says "I'm doing this stuff automatically because you set the env var."

Copy link
Contributor

@asottile-sentry asottile-sentry left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lobsterkatie lobsterkatie merged commit 8c8310d into master Feb 28, 2023
@lobsterkatie lobsterkatie deleted the kmclb-only-suggest-autoupdate-when-pulling-if-not-set branch February 28, 2023 21:38
jan-auer added a commit that referenced this pull request Mar 1, 2023
* master: (37 commits)
  ref(ppf): Don't use --commit-batch-size for futures queue length (#45182)
  feat(codecov-v2): Add more logging (#45225)
  fix(alerts): Center table items on alert history page (#45226)
  feat(CapMan): Pass `tenant_ids` to Snuba (#44788)
  ref(db): Drop `project_id` from Environment (model state) (#45207)
  chore(profiling): Rename context in profiles task (#45208)
  feat(replays): Improve index page query performance (#45098)
  chore(issue assignment): Add logging for`GroupOwner` auto assignment (#45142)
  fix(hybrid-cloud): Uncache organization when queueing it for deletion (#45213)
  fix(perf): Navigating to Transaction Summary from Trends widget should persist custom date selection (#45190)
  fix(pageFilter): Fix overflow (#45169)
  ref(git hooks): Only suggest autoupdate variable when pulling if not already set (#45179)
  fix(dashboard): Include dashboard filters in widget viewer (#45106)
  fix(alerts): Remove null projects from alerts list (#45202)
  feat(replay): Update Inline replay onboarding img to support dark mode (#45084)
  __iexact reduce call has default value now. (#45206)
  feat(replay): Use SDK value for LCP (#44868)
  chore(hybrid-cloud): breaking foreign keys (#45203)
  Revert "ref(db): Drop `project_id` from Environment (model state) (#45094)"
  ref(db): Drop `project_id` from Environment (model state) (#45094)
  ...
@github-actions github-actions bot locked and limited conversation to collaborators Mar 16, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Scope: Backend Automatically applied to PRs that change backend components

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants