Refs #19452: Change Mac Github CI to work for 3.0.x-devel

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
eProsima · Feb 22, 2024 · 13abfb4 · 13abfb4
1 parent 372485b
commit 13abfb4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/mac-ci.yml b/.github/workflows/mac-ci.yml
@@ -27,6 +27,7 @@ on:
   push:
     branches:
       - 'master'
+      - '3.0.x-devel'
       - '2.12.x'
       - '2.10.x'
       - '2.6.x'

diff --git a/.github/workflows/reusable-mac-ci.yml b/.github/workflows/reusable-mac-ci.yml
@@ -47,7 +47,7 @@ jobs:
       - name: Sync eProsima/Fast-DDS repository
         uses: eProsima/eProsima-CI/external/checkout@v0
         with:
-          path: src/fastrtps
+          path: src/fastdds
           ref: ${{ inputs.fastdds-branch }}
 
       - uses: eProsima/eProsima-CI/external/setup-python@v0
@@ -88,21 +88,21 @@ jobs:
           # Nightly job
           if [[ "${{ inputs.label }}" == *"nightly"* ]]
           then
-            DEPENDS_REPOS_PATH="./src/fastrtps/.github/workflows/config/nightly_${{ inputs.fastdds-branch }}.repos"
+            DEPENDS_REPOS_PATH="./src/fastdds/.github/workflows/config/nightly_${{ inputs.fastdds-branch }}.repos"
             if [ ! -f ${DEPENDS_REPOS_PATH} ]
             then
-              DEPENDS_REPOS_PATH="./src/fastrtps/.github/workflows/config/nightly_master.repos"
+              DEPENDS_REPOS_PATH="./src/fastdds/.github/workflows/config/nightly_master.repos"
             fi
-            META_PATH="./src/fastrtps/.github/workflows/config/nightly.meta"
+            META_PATH="./src/fastdds/.github/workflows/config/nightly.meta"
 
           # Either PR or manual
           else
-            DEPENDS_REPOS_PATH="./src/fastrtps/.github/workflows/config/default_ci_${{ inputs.fastdds-branch }}.repos"
+            DEPENDS_REPOS_PATH="./src/fastdds/.github/workflows/config/default_ci_${{ inputs.fastdds-branch }}.repos"
             if [ ! -f ${DEPENDS_REPOS_PATH} ]
             then
-              DEPENDS_REPOS_PATH="./src/fastrtps/.github/workflows/config/default_ci_master.repos"
+              DEPENDS_REPOS_PATH="./src/fastdds/.github/workflows/config/default_ci_master.repos"
             fi
-            META_PATH="./src/fastrtps/.github/workflows/config/default_ci.meta"
+            META_PATH="./src/fastdds/.github/workflows/config/default_ci.meta"
           fi
 
           echo "Selected repos files: ${DEPENDS_REPOS_PATH}"
@@ -139,7 +139,7 @@ jobs:
           colcon_test_args_default: --event-handlers=console_direct+
           ctest_args: ${{ inputs.ctest-args }}
           ctest_args_default: --repeat until-pass:3 --timeout 300 --label-exclude "xfail"
-          packages_names: fastrtps
+          packages_names: fastdds
           workspace: ${{ github.workspace }}
           test_report_artifact: ${{ format('test_report_{0}_{1}_{2}', inputs.label, github.job, join(matrix.*, '_')) }}