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

T6410: applied reusable workflows (auto-author-assign,check-pr-conflicts,lint-doc) (backport #1464) #1467

Merged
merged 6 commits into from
May 28, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 28, 2024

Applied reusable workflows

  • auto-author-assign
  • check-pr-conflicts
  • lint-doc

Change Summary

Applied reusable workflows (auto-author-assign, check-pr-conflicts, lint-doc)

Related Task(s)

Related PR(s)

Backport

Checklist:

(cherry picked from commit 7ddd96b)

# Conflicts:
#	.github/workflows/auto-author-assign.yml
#	.github/workflows/main.yml
(cherry picked from commit 87e8600)
(cherry picked from commit 8e5147d)
(cherry picked from commit 14cdcd2)
(cherry picked from commit 2530782)
@mergify mergify bot added the conflicts label May 28, 2024
Copy link
Author

mergify bot commented May 28, 2024

Cherry-pick of 7ddd96b has failed:

On branch mergify/bp/equuleus/pr-1464
Your branch is up to date with 'origin/equuleus'.

You are currently cherry-picking commit 7ddd96be.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	deleted:    .github/vyos-linter.py
	new file:   .github/workflows/check-pr-conflicts.yml
	new file:   .github/workflows/lint-doc.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/auto-author-assign.yml
	deleted by them: .github/workflows/main.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@kumvijaya kumvijaya requested review from a team, dmbaturin, sarthurdev, zdc, jestabro, sever-sever, c-po and rebortg and removed request for a team May 28, 2024 10:30
@rebortg
Copy link
Member

rebortg commented May 28, 2024

@kumvijaya are you able to solve the conflict?

@kumvijaya
Copy link
Contributor

kumvijaya commented May 28, 2024

@rebortg Yes, resolved conflict
.

@rebortg rebortg merged commit 7dfb68b into equuleus May 28, 2024
2 of 3 checks passed
@mergify mergify bot deleted the mergify/bp/equuleus/pr-1464 branch May 28, 2024 10:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

2 participants