Skip to content

tools/update_news_date: Fix script for squash-and-merge strategy#242

Merged
daschuer merged 1 commit intomixxxdj:websitefrom
Holzhaus:update-news-date-squash-and-merge
May 16, 2021
Merged

tools/update_news_date: Fix script for squash-and-merge strategy#242
daschuer merged 1 commit intomixxxdj:websitefrom
Holzhaus:update-news-date-squash-and-merge

Conversation

@Holzhaus
Copy link
Copy Markdown
Member

@Holzhaus Holzhaus commented May 9, 2021

When merging a blog post using squash-and-merge, no merge commit is created. This makes the update_news_date.py script fail because it can't find the corresponding merge commit. This was the case for #217. It only worked when #240 was merged, because now the blog post was part of a merge commit (see https://github.com/mixxxdj/website/runs/2536666268?check_suite_focus=true)

This fixes the issue by supporting squash-and-merge, too.

@Holzhaus Holzhaus added the bug label May 9, 2021
Comment thread tools/update_news_date.py Outdated
@Holzhaus Holzhaus force-pushed the update-news-date-squash-and-merge branch from 3cb2390 to affb7fa Compare May 9, 2021 10:51
@Holzhaus Holzhaus requested a review from daschuer May 16, 2021 12:41
Copy link
Copy Markdown
Member

@daschuer daschuer left a comment

Choose a reason for hiding this comment

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

Looks reasonable. So let's test it next time.

@daschuer daschuer merged commit ac00331 into mixxxdj:website May 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants