Skip to content
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.

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

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

Closed
collinmcnulty opened this issue Feb 13, 2024 · 2 comments · Fixed by #53
Closed

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

collinmcnulty opened this issue Feb 13, 2024 · 2 comments · Fixed by #53

Comments

@collinmcnulty
Copy link
Contributor

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
Copy link
Contributor

dym-ok commented Feb 13, 2024

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

@sunkickr
Copy link
Contributor

sunkickr commented Mar 5, 2024

This is fixed in v0.5

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants