Fix CI version management (#4484)

* Refs #20542: Fix CI version management Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20542: Apply internal revision suggestions Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20542: Add ignored paths to sanitizer events Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20542: Remove nightly files Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20542: Remove Windows CI test report Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20542: Remove unused action Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20542: Address last rev suggestions Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20542: Fix input branch on reusable windows CI Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20542: Manual cherry-pick of PR #4549 Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20542: Add missing ci.meta Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20542: Fix metas as yml Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20542: Fix paths to .metas Signed-off-by: EduPonz <eduardoponz@eprosima.com> --------- Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> Co-authored-by: EduPonz <eduardoponz@eprosima.com>
eProsima · Mar 14, 2024 · 75d6958 · 75d6958
1 parent 64cb990
commit 75d6958
Show file tree

Hide file tree

Showing 19 changed files with 96 additions and 367 deletions.
diff --git a/.github/actions/fetch-fastdds-repos/action.yml b/.github/actions/fetch-fastdds-repos/action.yml
diff --git a/.github/workflows/sanitizer-tests.yaml → .github/workflows/address-sanitizers.yaml b/.github/workflows/sanitizer-tests.yaml → .github/workflows/address-sanitizers.yaml
@@ -1,4 +1,4 @@
-name: Sanitizer analysis
+name: Address Sanitizer analysis
 
 on:
   workflow_dispatch:
@@ -11,12 +11,14 @@ on:
         description: 'Branch or tag of Fast DDS repository (https://github.com/eProsima/Fast-DDS)'
         required: true
         default: '2.6.x'
+
   pull_request:
-  push:
     branches:
-      - 2.6.x
-  schedule:
-    - cron: '0 1 * * *'
+      - '2.6.x'
+    paths-ignore:
+      - '**.md'
+      - '**.txt'
+      - '!**/CMakeLists.txt'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

diff --git a/.github/workflows/config/asan_colcon.meta b/.github/workflows/config/asan_colcon.meta
@@ -1,32 +1,19 @@
-{
-    "names":
-    {
-        "fastrtps":
-        {
-            "cmake-args":
-            [
-                "-DCMAKE_BUILD_TYPE=Debug",
-                "-DEPROSIMA_BUILD_TESTS=ON",
-                "-DGTEST_INDIVIDUAL=ON",
-                "-DRTPS_API_TESTS=ON",
-                "-DFASTRTPS_API_TESTS=ON",
-                "-DFASTDDS_PIM_API_TESTS=ON",
-                "-DPERFORMANCE_TESTS=ON",
-                "-DNO_TLS=OFF",
-                "-DSECURITY=ON",
-                "-DFASTDDS_STATISTICS=ON",
-                "-DSANITIZER=Address",
-                "-DCMAKE_CXX_FLAGS='-Werror'"
-            ]
-        },
-
-        "discovery-server":
-        {
-            "cmake-args":
-            [
-                "-DCMAKE_BUILD_TYPE=Debug",
-                "-DSANITIZER=Address",
-            ]
-        }
-    }
-}
+names:
+    fastrtps:
+        cmake-args:
+            - "-DCMAKE_BUILD_TYPE=Debug"
+            - "-DEPROSIMA_BUILD_TESTS=ON"
+            - "-DGTEST_INDIVIDUAL=ON"
+            - "-DRTPS_API_TESTS=ON"
+            - "-DFASTRTPS_API_TESTS=ON"
+            - "-DFASTDDS_PIM_API_TESTS=ON"
+            - "-DPERFORMANCE_TESTS=ON"
+            - "-DNO_TLS=OFF"
+            - "-DSECURITY=ON"
+            - "-DFASTDDS_STATISTICS=ON"
+            - "-DSANITIZER=Address"
+            - "-DCMAKE_CXX_FLAGS='-Werror'"
+    discovery-server:
+        cmake-args:
+            - "-DCMAKE_BUILD_TYPE=Debug"
+            - "-DSANITIZER=Address"
diff --git a/.github/workflows/config/nightly.meta → .github/workflows/config/ci.meta b/.github/workflows/config/nightly.meta → .github/workflows/config/ci.meta
diff --git a/.github/workflows/config/ci.repos b/.github/workflows/config/ci.repos
@@ -0,0 +1,5 @@
+repositories:
+    googletest-distribution:
+        type: git
+        url: https://github.com/google/googletest.git
+        version: release-1.11.0
diff --git a/.github/workflows/config/default_ci.meta b/.github/workflows/config/default_ci.meta
diff --git a/.github/workflows/config/default_ci_2.6.x.repos b/.github/workflows/config/default_ci_2.6.x.repos
diff --git a/.github/workflows/config/nightly_2.6.x.repos b/.github/workflows/config/nightly_2.6.x.repos
diff --git a/.github/workflows/config/tsan_colcon.meta b/.github/workflows/config/tsan_colcon.meta
@@ -1,32 +1,19 @@
-{
-    "names":
-    {
-        "fastcdr":
-        {
-            "cmake-args":
-            [
-                "-DCMAKE_C_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'",
-                "-DCMAKE_CXX_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
-            ]
-        },
-        "fastrtps":
-        {
-            "cmake-args":
-            [
-                "-DCOMPILE_EXAMPLES=OFF",
-                "-DEPROSIMA_BUILD_TESTS=ON",
-                "-DGTEST_INDIVIDUAL=ON",
-                "-DRTPS_API_TESTS=ON",
-                "-DFASTRTPS_API_TESTS=OFF",
-                "-DFASTDDS_PIM_API_TESTS=ON",
-                "-DPERFORMANCE_TESTS=ON",
-                "-DNO_TLS=OFF",
-                "-DSECURITY=ON",
-                "-DFASTDDS_STATISTICS=ON",
-                "-DCMAKE_C_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'",
-                "-DCMAKE_CXX_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
-            ]
-        }
-
-    }
-}
+names:
+    fastcdr:
+        cmake-args:
+            - "-DCMAKE_C_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
+            - "-DCMAKE_CXX_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
+    fastrtps:
+        cmake-args:
+            - "-DCOMPILE_EXAMPLES=OFF"
+            - "-DEPROSIMA_BUILD_TESTS=ON"
+            - "-DGTEST_INDIVIDUAL=ON"
+            - "-DRTPS_API_TESTS=ON"
+            - "-DFASTRTPS_API_TESTS=OFF"
+            - "-DFASTDDS_PIM_API_TESTS=ON"
+            - "-DPERFORMANCE_TESTS=ON"
+            - "-DNO_TLS=OFF"
+            - "-DSECURITY=ON"
+            - "-DFASTDDS_STATISTICS=ON"
+            - "-DCMAKE_C_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
+            - "-DCMAKE_CXX_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
diff --git a/.github/workflows/documentation-tests.yaml b/.github/workflows/documentation-tests.yaml
@@ -8,14 +8,6 @@ on:
         type: string
         default: '2.6.x'
 
-  push:
-    branches:
-      - '2.6.x'
-    paths-ignore:
-      - '**.md'
-      - '**.txt'
-      - '!**/CMakeLists.txt'
-
   pull_request:
     branches:
       - '2.6.x'

diff --git a/.github/workflows/mac-ci.yml b/.github/workflows/mac-ci.yml
@@ -24,18 +24,13 @@ on:
         type: string
         required: true
 
-  push:
+  pull_request:
     branches:
       - '2.6.x'
     paths-ignore:
       - '**.md'
       - '**.txt'
       - '!**/CMakeLists.txt'
-  pull_request:
-    paths-ignore:
-      - '**.md'
-      - '**.txt'
-      - '!**/CMakeLists.txt'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -49,6 +44,6 @@ jobs:
     with:
       label: ${{ inputs.label || 'mac-ci' }}
       colcon-args: ${{ inputs.colcon-args }}
-      cmake-args: ${{ inputs.cmake-args }}
+      cmake-args: '-DSECURITY=ON ${{ inputs.cmake-args }}'
       ctest-args: ${{ inputs.ctest-args }}
       fastdds-branch: ${{ inputs.fastdds_branch || github.ref || '2.6.x' }}
diff --git a/.github/workflows/nightly-mac-ci.yml b/.github/workflows/nightly-mac-ci.yml
diff --git a/.github/workflows/nightly-windows-ci.yml b/.github/workflows/nightly-windows-ci.yml
diff --git a/.github/workflows/reusable-mac-ci.yml b/.github/workflows/reusable-mac-ci.yml
@@ -82,38 +82,19 @@ jobs:
       # TODO(eduponz): Set up libp11 and SoftHSM. NOTE: using SoftHSM requires adding the runner to a group,
       #                which entails logout/login or rebooting the machine. This is not feasible in a CI environment.
 
-      - name: Prepare colcon workspace
-        id: colcon_ws_setup
-        run: |
-          # Nightly job
-          if [[ "${{ inputs.label }}" == *"nightly"* ]]
-          then
-            DEPENDS_REPOS_PATH="./src/fastrtps/.github/workflows/config/nightly_${{ inputs.fastdds-branch }}.repos"
-            if [ ! -f ${DEPENDS_REPOS_PATH} ]
-            then
-              DEPENDS_REPOS_PATH="./src/fastrtps/.github/workflows/config/nightly_2.6.x.repos"
-            fi
-            META_PATH="./src/fastrtps/.github/workflows/config/nightly.meta"
-
-          # Either PR or manual
-          else
-            DEPENDS_REPOS_PATH="./src/fastrtps/.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_2.6.x.repos"
-            fi
-            META_PATH="./src/fastrtps/.github/workflows/config/default_ci.meta"
-          fi
-
-          echo "Selected repos files: ${DEPENDS_REPOS_PATH}"
-          cat ${DEPENDS_REPOS_PATH}
-
-          echo "Selected metas files: ${META_PATH}"
-          cp ${META_PATH} ci.meta
-          cat ci.meta
+      - name: Fetch Fast DDS dependencies
+        uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0
+        with:
+          vcs_repos_file: ${{ github.workspace }}/src/fastrtps/fastrtps.repos
+          destination_workspace: src
+          skip_existing: 'true'
 
-          # Create source dir and download the sources
-          vcs import src --input ${DEPENDS_REPOS_PATH} --skip-existing
+      - name: Fetch Fast DDS CI dependencies
+        uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0
+        with:
+          vcs_repos_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/ci.repos
+          destination_workspace: src
+          skip_existing: 'true'
 
       # TODO(eduponz): There is a warning in clang >= 16 regarding enum-constexpr-conversion:
       #   - Issue: https://github.com/boostorg/mpl/issues/69.
@@ -123,7 +104,7 @@ jobs:
         continue-on-error: false
         uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
         with:
-          colcon_meta_file: ${{ github.workspace }}/ci.meta
+          colcon_meta_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/ci.meta
           colcon_build_args: ${{ inputs.colcon-args }}
           cmake_args: ${{ inputs.cmake-args }}
           cmake_args_default: -DCMAKE_CXX_FLAGS="-Werror -Wall -Wno-enum-constexpr-conversion"