Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented May 20, 2022

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

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

You are currently cherry-picking commit b0ebf5a.
  (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/ci.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/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

* Modify CI

* Update

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

* Update

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

* Update .github/workflows/ci.yml

* Update .github/workflows/ci.yml

* Modify CI

* Update to ubuntu latest

* Use pre-release repository

* Use ubuntu-20.04

* Fix

* Revert changes

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
(cherry picked from commit b0ebf5a)

# Conflicts:
#	.github/workflows/ci.yml
@mergify mergify bot added the conflicts label May 20, 2022
@mergify mergify bot mentioned this pull request May 20, 2022
@Acuadros95 Acuadros95 changed the title Humble release (backport #135) Update CI (backport #135) May 20, 2022
@Acuadros95 Acuadros95 requested a review from pablogs9 May 20, 2022 10:45
@Acuadros95 Acuadros95 merged commit 3c5d31f into galactic May 23, 2022
@Acuadros95 Acuadros95 deleted the mergify/bp/galactic/pr-135 branch May 23, 2022 05:56
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.

2 participants