Skip to content

ci: improve import path action (backport #2104)#2397

Merged
p0mvn merged 1 commit intov11.xfrom
mergify/bp/v11.x/pr-2104
Aug 13, 2022
Merged

ci: improve import path action (backport #2104)#2397
p0mvn merged 1 commit intov11.xfrom
mergify/bp/v11.x/pr-2104

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Aug 13, 2022

This is an automatic backport of pull request #2104 done by Mergify.
Cherry-pick of dcc82d7 has failed:

On branch mergify/bp/v11.x/pr-2104
Your branch is up to date with 'origin/v11.x'.

You are currently cherry-picking commit dcc82d72.
  (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/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/import_paths.yml
	both modified:   scripts/replace_import_paths.sh

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/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot requested a review from a team August 13, 2022 01:42
@mergify mergify bot added the conflicts label Aug 13, 2022
@mergify mergify bot assigned p0mvn Aug 13, 2022
@p0mvn p0mvn force-pushed the mergify/bp/v11.x/pr-2104 branch from 75d4295 to 20216c5 Compare August 13, 2022 01:44
@p0mvn
Copy link
Copy Markdown
Member

p0mvn commented Aug 13, 2022

The script itself is already backport via another PR, only need the CI job from here

@p0mvn p0mvn merged commit f012c56 into v11.x Aug 13, 2022
@p0mvn p0mvn deleted the mergify/bp/v11.x/pr-2104 branch August 13, 2022 02:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

1 participant