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

aibryte-ci: fix broken git diff when run on the main branch #37654

Merged
merged 1 commit into from
Apr 29, 2024

Conversation

alafanechere
Copy link
Contributor

@alafanechere alafanechere commented Apr 29, 2024

Reverts #37641

#37616 introduced a change in the how we checkout the diffed branch and the target branch (which can be a fork).
It did not work when the target branch and the diffed branch are the same (master) as git did not know which branch to checkout as we fetch it from two different remotes targetting the same urls.
This broke the publish pipeline as it runs on master.

The fix is to not fetch the target branch from the target remote if the target branch and the diffed branch have the same name.

@alafanechere alafanechere requested a review from a team as a code owner April 29, 2024 07:37
Copy link

vercel bot commented Apr 29, 2024

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 Apr 29, 2024 8:17am

Copy link
Contributor Author

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @alafanechere and the rest of your teammates on Graphite Graphite

@alafanechere alafanechere changed the title Revert "Revert "airbyte-ci: improve git diff comparison (#37616)"" aibryte-ci: fix broken git diff when run on the main branch Apr 29, 2024
@alafanechere
Copy link
Contributor Author

/approve-and-merge reason="bug fix in airbyte-ci to test on master and unblock community-ci + publish"

@octavia-approvington
Copy link
Contributor

Our work here is done
done

@octavia-approvington octavia-approvington merged commit 005e12c into master Apr 29, 2024
35 checks passed
@octavia-approvington octavia-approvington deleted the revert-37641-ella/revert branch April 29, 2024 08:37
Copy link

sentry-io bot commented Apr 30, 2024

Suspect Issues

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

  • ‼️ ExecError: process "git fetch target stephane/05-10-destination-snowflake_bump_cdk_version" did not complete... dagger.client._core in execute View Issue
  • ‼️ QueryError: failed to copy: httpReadSeeker: failed open: failed to do request: Get "https://production.cloudf... dagger.client._core in execute View Issue
  • ‼️ ExecError: process "git fetch target augustin/05-02-airbyte-ci_set_--yes-auto-update_by_default" did not com... pipelines.dagger.containers.git in checked_out_... View Issue
  • ‼️ ExecError: process "git fetch target ng/prettier-no-prose-wrap" did not complete successfully: exit code: 128 pipelines.dagger.containers.git in checked_out_... View Issue
  • ‼️ ExecError: process "git fetch target 05-09-bug_registry_fix_slack_notification" did not complete successfull... dagger.client._core in 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