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

ci: always run ci (backport #4334) #4335

Merged
merged 5 commits into from
Sep 3, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 30, 2024

This may fix PR hanging like this: #4196.
The drawback is that docs PRs will take longer to have CI pass, but may unblock us.


This is an automatic backport of pull request #4334 done by Mergify.

(cherry picked from commit 294ec4d)

# Conflicts:
#	.github/workflows/md-link-checker.yml
#	.github/workflows/test-integration.yml
#	.github/workflows/test-lint.yml
#	.github/workflows/test.yml
Copy link
Contributor Author

mergify bot commented Aug 30, 2024

Cherry-pick of 294ec4d has failed:

On branch mergify/bp/release/v28.x.y/pr-4334
Your branch is up to date with 'origin/release/v28.x.y'.

You are currently cherry-picking commit 294ec4d5.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/md-link-checker.yml
	both modified:   .github/workflows/test-integration.yml
	both modified:   .github/workflows/test-lint.yml
	both modified:   .github/workflows/test.yml

no changes added to commit (use "git add" and/or "git commit -a")

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

@mergify mergify bot requested a review from ilgooz as a code owner August 30, 2024 16:16
@mergify mergify bot added the conflicts label Aug 30, 2024
@github-actions github-actions bot added component:ci CI/CD workflow and automated jobs. component:configs labels Aug 30, 2024
@julienrbrt julienrbrt added the skip-changelog Don't check changelog for new entries label Aug 30, 2024
Copy link
Member

@salmad3 salmad3 left a comment

Choose a reason for hiding this comment

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

update was merged with the conflict markers

@julienrbrt julienrbrt enabled auto-merge (squash) August 30, 2024 21:59
@julienrbrt
Copy link
Member

#4336 (comment)

@julienrbrt julienrbrt merged commit da90c3e into release/v28.x.y Sep 3, 2024
42 of 44 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v28.x.y/pr-4334 branch September 3, 2024 09:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component:ci CI/CD workflow and automated jobs. component:cmd component:configs skip-changelog Don't check changelog for new entries type:internal
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants