Rebase and Merge causes incorrect use of dag only deploy

collinmcnulty commented 9 months ago

A user noticed that git diff --name-only HEAD^..HEAD returns only one change when Rebase and Merge is selected(as shown in below example) as part of PR merge when there is more than 1 commit.

The user reproduced this locally and reported to Astronomer Support. Though there were two commits(first commit: to include folder and latest commit: to dag folder) but only latest commit is returned as the Rebase and merge is used when merging the PR.

It appears that the Astronomer Github Action only works,

when either Squash and Merge strategy is used when there is more than 1 commit or
When Rebase and merge is used when there is only 1 commit but it doesn't work if Rebase and merge is used when there is more than 1 commit.

dym-ok commented 9 months ago

I can confirm this affects us too, thanks for raising this 🙏🏾

sunkickr commented 8 months ago

This is fixed in v0.5

astronomer / deploy-action

Rebase and Merge causes incorrect use of dag only deploy #52