From d8501aaeea62fbad16bfbcecdd9c9d55f4ac9c4c Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Wed, 10 Nov 2021 09:05:17 +0100 Subject: [PATCH 1/2] Temporal disable Rolling Agent CI (#408) (cherry picked from commit 218170bcf20417c22d03bcbb5300d1312149ec5a) # Conflicts: # .github/workflows/nightly.yml --- .github/workflows/nightly.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index c9d97792..d060a5b6 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -372,8 +372,15 @@ jobs: include: - distro: foxy branch: foxy +<<<<<<< HEAD - distro: rolling branch: main +======= + # - distro: rolling + # branch: main + - distro: galactic + branch: galactic +>>>>>>> 218170b (Temporal disable Rolling Agent CI (#408)) needs: micro_ros_build container: ros:${{ matrix.distro }} @@ -409,4 +416,4 @@ jobs: - name: installation run: | - (test -f install/micro_ros_agent/lib/micro_ros_agent/micro_ros_agent) && true || false \ No newline at end of file + (test -f install/micro_ros_agent/lib/micro_ros_agent/micro_ros_agent) && true || false From 3aa847e33a017d2d4e21262f3b4f4b80b8ad210a Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Wed, 10 Nov 2021 09:15:01 +0100 Subject: [PATCH 2/2] Update nightly.yml --- .github/workflows/nightly.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index d060a5b6..14b243b1 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -372,15 +372,10 @@ jobs: include: - distro: foxy branch: foxy -<<<<<<< HEAD - - distro: rolling - branch: main -======= # - distro: rolling # branch: main - distro: galactic branch: galactic ->>>>>>> 218170b (Temporal disable Rolling Agent CI (#408)) needs: micro_ros_build container: ros:${{ matrix.distro }}