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) #487

Merged
merged 2 commits into from
Mar 30, 2022
Merged

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/foxy/pr-486
Your branch is up to date with 'origin/foxy'.

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 <[email protected]>
(cherry picked from commit d71ce51)

# Conflicts:
#	.github/workflows/ci.yml
#	.github/workflows/nightly.yml
@mergify mergify bot requested a review from pablogs9 as a code owner March 30, 2022 07:58
@mergify mergify bot added the conflicts label Mar 30, 2022
@mergify mergify bot mentioned this pull request Mar 30, 2022
Signed-off-by: Pablo Garrido <[email protected]>
@pablogs9 pablogs9 merged commit fdeff43 into foxy Mar 30, 2022
@pablogs9 pablogs9 deleted the mergify/bp/foxy/pr-486 branch March 30, 2022 08:25
nomumu added a commit to nomumu/micro_ros_setup that referenced this pull request Sep 12, 2022
* Update yaml_filter.py (micro-ROS#365) (micro-ROS#367)

(cherry picked from commit ce41dcb)

Co-authored-by: Pablo Garrido <[email protected]>

* Support for flashing Olimex STM32-E407 with STLINK v2 debuggers (micro-ROS#374)

* Update standalone build tools section (backport micro-ROS#380) (micro-ROS#382)

* Update standalone build tools section (micro-ROS#380)

* Update standalone build tools section

* Upd

* Updates

(cherry picked from commit e13e64d)

# Conflicts:
#	README.md

* Update

Co-authored-by: Pablo Garrido <[email protected]>

* Simplify micro-ROS Agent build (micro-ROS#378) (micro-ROS#384)

* Simplify agent build

* Revert this

* Update config/agent_uros_packages.repos

Co-authored-by: Pablo Garrido <[email protected]>

Co-authored-by: Antonio Cuadros <[email protected]>
(cherry picked from commit 70ccf66)

Co-authored-by: Pablo Garrido <[email protected]>

* Update README.md (micro-ROS#386) (micro-ROS#387)

(cherry picked from commit a4c138e)

Co-authored-by: Pablo Garrido <[email protected]>

* Add renesas RA6M5 (backport micro-ROS#390) (micro-ROS#391)

* Add renesas RA6M5 (micro-ROS#390)

* Add renesas RA6M5

* Fix

* Avoid toolchain

(cherry picked from commit d27b83e)

# Conflicts:
#	README.md

* Fix

Co-authored-by: Pablo Garrido <[email protected]>

* openocd: added script to reset devices (micro-ROS#399)

* fix: use FW_TARGETDIR instead of firmware (micro-ROS#400)

* Temporal disable Rolling Agent CI (backport micro-ROS#408) (micro-ROS#410)

* Temporal disable Rolling Agent CI (micro-ROS#408)

(cherry picked from commit 218170b)

# Conflicts:
#	.github/workflows/nightly.yml

* Update nightly.yml

Co-authored-by: Pablo Garrido <[email protected]>

* Remove unnecessary rosdep (micro-ROS#411) (micro-ROS#412)

(cherry picked from commit c03d66e)

Co-authored-by: Pablo Garrido <[email protected]>

* Fix rosdep (backport micro-ROS#414) (micro-ROS#415)

* Fix rosdep (micro-ROS#414)

* Fix rosdep

* Update

(cherry picked from commit 3a28e75)

# Conflicts:
#	scripts/create_firmware_ws.sh

* Fix conflicts

Co-authored-by: Pablo Garrido <[email protected]>

* Modify host build (micro-ROS#418) (micro-ROS#421)

(cherry picked from commit 97f013e)

Co-authored-by: Pablo Garrido <[email protected]>

* Skip existing repos in vcs (micro-ROS#419) (micro-ROS#423)

(cherry picked from commit ecdd1ab)

Co-authored-by: Pablo Garrido <[email protected]>

* Fix host src folder (micro-ROS#417) (micro-ROS#425)

(cherry picked from commit fc7faa3)

Co-authored-by: Pablo Garrido <[email protected]>

* Build dynamic lib of rosidl_typesupport _microxrcedds (backport micro-ROS#473) (micro-ROS#475)

* build dynamic lib of rosidl_typesupport of (micro-ROS#473)

microxrcedds_c

(cherry picked from commit 3136ad0)

# Conflicts:
#	config/host/generic/build.sh
#	config/host/generic/client_host_packages.repos

* Conflicts

Signed-off-by: Pablo Garrido <[email protected]>

Co-authored-by: VictorLee <[email protected]>
Co-authored-by: Pablo Garrido <[email protected]>

* Fix Zephyr CI (backport micro-ROS#480) (micro-ROS#482)

* Fix Zephyr CI (micro-ROS#480)

Signed-off-by: Pablo Garrido <[email protected]>
(cherry picked from commit 0942f74)

# Conflicts:
#	config/zephyr/generic/create.sh

* Update

Signed-off-by: Pablo Garrido <[email protected]>

Co-authored-by: Pablo Garrido <[email protected]>

* Update changelog

Signed-off-by: Pablo Garrido <[email protected]>

* 1.0.0

* Enable rolling agent (backport micro-ROS#479) (micro-ROS#484)

* Enable rolling agent (micro-ROS#479)

* Enable rolling agent

Signed-off-by: Pablo Garrido <[email protected]>

* Install python3.9-dev

Signed-off-by: Pablo Garrido <[email protected]>

* Fix

Signed-off-by: Pablo Garrido <[email protected]>
(cherry picked from commit 91ed371)

# Conflicts:
#	.github/workflows/ci.yml
#	.github/workflows/nightly.yml

* update

Signed-off-by: Pablo Garrido <[email protected]>

Co-authored-by: Pablo Garrido <[email protected]>

* Fix CI

Signed-off-by: Pablo Garrido <[email protected]>

* Fix CI

Signed-off-by: Pablo Garrido <[email protected]>

* Fix Agent and host Rolling CI (backport micro-ROS#486) (micro-ROS#487)

* Fix Agent and host Rolling CI (micro-ROS#486)

Signed-off-by: Pablo Garrido <[email protected]>
(cherry picked from commit d71ce51)

# Conflicts:
#	.github/workflows/ci.yml
#	.github/workflows/nightly.yml

* Fix 

Signed-off-by: Pablo Garrido <[email protected]>

Co-authored-by: Pablo Garrido <[email protected]>

* Fix CI upgrade ROS docker (micro-ROS#489)

Signed-off-by: Pablo Garrido <[email protected]>

* Remove Python 3.9 (backport micro-ROS#496) (micro-ROS#497)

* Remove Python 3.9 (micro-ROS#496)

Signed-off-by: Pablo Garrido <[email protected]>
(cherry picked from commit d327cba)

# Conflicts:
#	.github/workflows/ci.yml

* Update

Signed-off-by: Pablo Garrido <[email protected]>

Co-authored-by: Pablo Garrido <[email protected]>

* Modified zephyr create.sh to pull correct toolchain based on arch (micro-ROS#499) (micro-ROS#501)

(cherry picked from commit 8793b5a)

Co-authored-by: Drew Hoener <[email protected]>

* Fix readme rosdep (micro-ROS#506) (micro-ROS#507)

Signed-off-by: Pablo Garrido <[email protected]>
(cherry picked from commit c546b01)

Co-authored-by: Pablo Garrido <[email protected]>

* Add platformIO to Readme (micro-ROS#510) (micro-ROS#511)

(cherry picked from commit f0e7398)

Co-authored-by: Antonio Cuadros <[email protected]>

* Add renesas dummy meta (micro-ROS#516) (micro-ROS#517)

Signed-off-by: Pablo Garrido <[email protected]>
(cherry picked from commit c1ee153)

Co-authored-by: Pablo Garrido <[email protected]>

* Fix PyYaml unistall error (micro-ROS#521)

* Update changelog

Signed-off-by: Pablo Garrido <[email protected]>

* 1.1.0

* Remove unnessary check (micro-ROS#553) (micro-ROS#567)

Signed-off-by: Kevin Goez <[email protected]>

Signed-off-by: Kevin Goez <[email protected]>
(cherry picked from commit b81290a)

Co-authored-by: k7g03z <[email protected]>

Signed-off-by: Pablo Garrido <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Pablo Garrido <[email protected]>
Co-authored-by: Bhavesh Kakwani <[email protected]>
Co-authored-by: David Jablonski <[email protected]>
Co-authored-by: VictorLee <[email protected]>
Co-authored-by: Drew Hoener <[email protected]>
Co-authored-by: Antonio Cuadros <[email protected]>
Co-authored-by: k7g03z <[email protected]>
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.

1 participant