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

pipeline: more pipeline config fixes #61777

Merged
merged 4 commits into from
Apr 11, 2024
Merged

Conversation

burmudar
Copy link
Contributor

Sooooooooooooo. Backport builds are still failing see https://buildkite.com/sourcegraph/sourcegraph/builds/268392

The base branch is empty when it's a merge into a branch - when a PR for a backport gets merged into the backport branch ... In that case - what we actually want to do:

  1. Diff with the previous commit on this branch
  2. NOT DIFF WITH origin/main ... right?

Test plan

CI and attempting a merge into this branch

@burmudar burmudar requested a review from a team April 11, 2024 09:56
@burmudar burmudar self-assigned this Apr 11, 2024
Copy link

cla-bot bot commented Apr 11, 2024

We require contributors to sign our Contributor License Agreement (CLA), and we don't have yours on file. In order for us to review and merge your code, please sign CLA to get yourself added.

Sourcegraph teammates should refer to Accepting contributions for guidance.

@burmudar burmudar changed the base branch from main to 5.3.9104 April 11, 2024 09:57
Copy link
Member

@Strum355 Strum355 left a comment

Choose a reason for hiding this comment

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

There's only so many ways to do it, one of ems gotta be right lol

@burmudar burmudar marked this pull request as draft April 11, 2024 10:02
@burmudar burmudar marked this pull request as ready for review April 11, 2024 10:02
@cla-bot cla-bot bot added the cla-signed label Apr 11, 2024
@burmudar burmudar merged commit fcd69c4 into 5.3.9104 Apr 11, 2024
10 checks passed
@burmudar burmudar deleted the wb/more-pipeline-config-fixes branch April 11, 2024 10:17
burmudar added a commit that referenced this pull request Apr 11, 2024
* pipeline: look at prev commit if base branch is empty
* print out diff command
* fix new line
burmudar added a commit that referenced this pull request Apr 11, 2024
pipeline: more pipeline config fixes (#61777)

* pipeline: look at prev commit if base branch is empty
* print out diff command
* fix new line
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants