Skip to content

glob expand extra-src-files when tracking for rebuild (backport #7608) #7767

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

Merged
merged 1 commit into from
Nov 30, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 22, 2021

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


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.io/

* glob expand extra-src-files when tracking for rebuild

* changelog

Co-authored-by: Gershom Bazerman <gershom@arista.com>
(cherry picked from commit 751308c)
@Mikolaj
Copy link
Member

Mikolaj commented Nov 30, 2021

The CI failures seem transient and I think this didn't land on 3.6 from any other source, so let me try to rebase and re-test.

@Mikolaj
Copy link
Member

Mikolaj commented Nov 30, 2021

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Nov 30, 2021

rebase

☑️ Nothing to do

  • -closed [:pushpin: rebase requirement]
  • #commits-behind>0 [:pushpin: rebase requirement]

@Mikolaj
Copy link
Member

Mikolaj commented Nov 30, 2021

@Mergifyio squash

@mergify
Copy link
Contributor Author

mergify bot commented Nov 30, 2021

squash

✅ Pull request is already one-commit long

@Mikolaj
Copy link
Member

Mikolaj commented Nov 30, 2021

I can't get the CI to re-run, so let me force-merge and we will observe CI on the 3.6 branch after the merge.

@Mikolaj Mikolaj merged commit 763d0cc into 3.6 Nov 30, 2021
@mergify mergify bot deleted the mergify/bp/3.6/pr-7608 branch November 30, 2021 19:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants