From e79898ce1782e464ec65f980d19ec77dbf70af0a Mon Sep 17 00:00:00 2001 From: jsantiago-eProsima <90755661+jsantiago-eProsima@users.noreply.github.com> Date: Tue, 18 Jul 2023 09:33:26 +0200 Subject: [PATCH] Added iron branches to rebase workflow (#18) * Refs #19118: Added iron branches to rebase workflow Signed-off-by: Javier Santiago * Refs #19118: Removed galactic from rebase job Signed-off-by: Javier Santiago --------- Signed-off-by: Javier Santiago --- .github/workflows/rebase-ros-rmw_fastrtps.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/rebase-ros-rmw_fastrtps.yml b/.github/workflows/rebase-ros-rmw_fastrtps.yml index 181934129..6f8b34697 100644 --- a/.github/workflows/rebase-ros-rmw_fastrtps.yml +++ b/.github/workflows/rebase-ros-rmw_fastrtps.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - dest_branch: ['master', 'galactic', 'humble', 'vulcanexus', 'vulcanexus-galactic', 'vulcanexus-humble'] + dest_branch: ['master', 'humble', 'iron', 'vulcanexus', 'vulcanexus-humble', 'vulcanexus-iron'] steps: # Step 1: run a standard checkout action, provided by github (REQUIRED) @@ -34,30 +34,30 @@ jobs: # Step 3: Rebase - name: Rebase current branch to upstream changes - id: rebase_master_galactic + id: rebase_master run: | git fetch ros ${{ matrix.dest_branch }} git rebase ros/${{ matrix.dest_branch }} shell: bash - if: matrix.dest_branch == 'master' || matrix.dest_branch == 'galactic' || matrix.dest_branch == 'humble' + if: matrix.dest_branch == 'master' || matrix.dest_branch == 'humble' || matrix.dest_branch == 'iron' - id: rebase_vulcanexus run: | git fetch ros master git rebase ros/master shell: bash if: matrix.dest_branch == 'vulcanexus' - - id: rebase_vulcanexus_galactic - run: | - git fetch ros galactic - git rebase ros/galactic - shell: bash - if: matrix.dest_branch == 'vulcanexus-galactic' - id: rebase_vulcanexus_humble run: | git fetch ros humble git rebase ros/humble shell: bash if: matrix.dest_branch == 'vulcanexus-humble' + - id: rebase_vulcanexus_iron + run: | + git fetch ros iron + git rebase ros/iron + shell: bash + if: matrix.dest_branch == 'vulcanexus-iron' # Step 4: Push - name: Force push if required