Skip to content

[Backport 1.x] Auto-increment next development iteration.#2164

Merged
VachaShah merged 1 commit into1.xfrom
backport/backport-1816-to-1.x
Mar 2, 2022
Merged

[Backport 1.x] Auto-increment next development iteration.#2164
VachaShah merged 1 commit into1.xfrom
backport/backport-1816-to-1.x

Conversation

@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

@opensearch-trigger-bot opensearch-trigger-bot bot commented Feb 18, 2022

Backport 7a38109 from #1816

@opensearch-ci-bot
Copy link
Copy Markdown
Collaborator

opensearch-ci-bot commented Feb 18, 2022

Can one of the admins verify this patch?

@opensearch-ci-bot
Copy link
Copy Markdown
Collaborator

opensearch-ci-bot commented Feb 18, 2022

❌   Gradle Check failure 9e7bf7f
Log 2545

Reports 2545

@VachaShah VachaShah closed this Feb 21, 2022
@VachaShah VachaShah reopened this Feb 21, 2022
@dblock
Copy link
Copy Markdown
Member

dblock commented Mar 1, 2022

@VachaShah care to help with this? thanks

@VachaShah
Copy link
Copy Markdown
Contributor

VachaShah commented Mar 2, 2022 •
edited
Loading

@VachaShah care to help with this? thanks

@dblock I opened a manual backport PR #2306 but the DCO fails for that too. Is there something that changed for your DCO?

Also, I think you would be able to amend the commit in this auto backport PR to fix the DCO.

When the backport workflow runs, it picks the author as the name and email of the user which can be different from the DCO sign (reference #2165). So the DCO failure in this PR makes sense. Also, we have the new DCO app now running on PRs which helps fix this issue. But I am not sure why the DCO is failing in a manual backport.

@dblock dblock force-pushed the backport/backport-1816-to-1.x branch from d2a4336 to 9d4a316 Compare March 2, 2022 22:27
@dblock
Auto-increment next development iteration. (#1816)
de8bba2 
* Auto-increment next development iteration.

Signed-off-by: dblock <dblock@amazon.com>

* Make bwc increments on X.Y and main branches.

Signed-off-by: dblock <dblock@amazon.com>
Signed-off-by: dblock <dblock@dblock.org>
@dblock dblock force-pushed the backport/backport-1816-to-1.x branch from 9d4a316 to de8bba2 Compare March 2, 2022 22:27
@dblock
Copy link
Copy Markdown
Member

dblock commented Mar 2, 2022

Looks like it has something to do with me working on two different machines where one is set to my amazon email and the other to personal. I rebased/signed/amended this PR.

@dblock dblock requested review from a team and VachaShah March 2, 2022 22:28
@dblock dblock mentioned this pull request Mar 2, 2022
Closed
1 task
@opensearch-ci-bot
Copy link
Copy Markdown
Collaborator

opensearch-ci-bot commented Mar 2, 2022

❌   Gradle Check failure d2a43369b959ec3914edca3b582aa7d58c215487
Log 2942

Reports 2942

@opensearch-ci-bot
Copy link
Copy Markdown
Collaborator

opensearch-ci-bot commented Mar 2, 2022

✅   Gradle Check success de8bba2
Log 2943

Reports 2943

@VachaShah VachaShah merged commit f366c8a into 1.x Mar 2, 2022
@github-actions github-actions bot deleted the backport/backport-1816-to-1.x branch March 2, 2022 23:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@VachaShah VachaShah VachaShah approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@opensearch-ci-bot @dblock @VachaShah