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

Fix Agent and host Rolling CI (backport #486) #488

Merged
merged 2 commits into from
Mar 30, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 30, 2022

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

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

You are currently cherry-picking commit d71ce51.
  (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
	both modified:   .github/workflows/nightly.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

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
(cherry picked from commit d71ce51)

# Conflicts:
#	.github/workflows/ci.yml
#	.github/workflows/nightly.yml
Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
Comment on lines +527 to +528
# Workaround. Remove when https://discourse.ros.org/t/preparing-for-rolling-sync-delayed-by-python-3-10-transition/24521 solved
apt install -y python3.9-dev
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
# Workaround. Remove when https://discourse.ros.org/t/preparing-for-rolling-sync-delayed-by-python-3-10-transition/24521 solved
apt install -y python3.9-dev

Should this be backported?

Copy link
Member

@pablogs9 pablogs9 Mar 30, 2022

Choose a reason for hiding this comment

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

I'm not sure if the .yml file that is executed is the one in the default branch aka galactic... So we idk if we are able to have different scripts for each branch.

@pablogs9 pablogs9 merged commit cfdcc37 into galactic Mar 30, 2022
@pablogs9 pablogs9 deleted the mergify/bp/galactic/pr-486 branch March 30, 2022 08:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants