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

unrevert #32806 #32847

Merged
merged 8 commits into from
Nov 28, 2023
Merged

unrevert #32806 #32847

merged 8 commits into from
Nov 28, 2023

Conversation

postamar
Copy link
Contributor

@postamar postamar commented Nov 27, 2023

Reverts the revert of #32806 and fixes the following:

  • stop relying on git_revision when computing a diff because it's not always what we think it is (when git_branch is not master, it's an orphan merge commit)
  • stop eagerly computing the diff

I have no idea how to test any of this. This is as good as I can do.

Copy link

vercel bot commented Nov 27, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

1 Ignored Deployment
Name Status Preview Comments Updated (UTC)
airbyte-docs ⬜️ Ignored (Inspect) Visit Preview Nov 28, 2023 4:04pm

@postamar postamar force-pushed the postamar/revert-revert-32806 branch from eebcaef to 5bb07fa Compare November 27, 2023 18:30
@postamar postamar marked this pull request as ready for review November 27, 2023 19:36
@postamar postamar closed this Nov 27, 2023
@postamar postamar reopened this Nov 27, 2023
@postamar postamar requested a review from a team November 27, 2023 19:37
Copy link
Contributor

@bnchrch bnchrch left a comment

Choose a reason for hiding this comment

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

Best we could do to test is to set the --is-ci flag locally and run using modified a few times.

Thinking about it the worst case scenario here is we merge, do a prepublish test using modified on a subsequent branch, and if that goes bad, revert again.

If thats true then Im personally fine to merge and play with fire on master

@postamar
Copy link
Contributor Author

Thanks for taking a look.

Best we could do to test is to set the --is-ci flag locally and run using modified a few times.

That's as far as I got. OK, I'll merge this tomorrow morning early. Let's see what gives!

@postamar postamar enabled auto-merge (squash) November 28, 2023 19:35
@postamar postamar disabled auto-merge November 28, 2023 20:38
@postamar postamar merged commit 3126204 into master Nov 28, 2023
21 checks passed
@postamar postamar deleted the postamar/revert-revert-32806 branch November 28, 2023 20:38
Copy link

sentry-io bot commented Dec 8, 2023

Suspect Issues

This pull request was deployed and Sentry observed the following issues:

  • ‼️ ExecError: failed to solve: process "git remote add --fetch --track augustin/12-8/fix-airbyte-ci-doc --track... dagger.api.base in _handle_execute View Issue

Did you find this useful? React with a 👍 or 👎

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 this pull request may close these issues.

2 participants