[20542] Pin CMake version and vm.mmap_rnd_bits in sanitizer workflows (…

…#4558) * Refs #20542: Fix CMake version in sanitizer workflows Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20542: Install correct version of Gtest Signed-off-by: EduPonz <eduardoponz@eprosima.com> * fixup! Refs #20542: Fix CMake version in sanitizer workflows * Refs #20542: Set number of random bits for mmap to 28 Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20542: Fix asan_colcon.meta Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20542: Use CCache also for ASan DS Signed-off-by: EduPonz <eduardoponz@eprosima.com> --------- Signed-off-by: EduPonz <eduardoponz@eprosima.com> (cherry picked from commit 0c439a0) Signed-off-by: EduPonz <eduardoponz@eprosima.com>
eProsima · Mar 16, 2024 · 13902cb · 13902cb
1 parent fa2c790
commit 13902cb
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 46 deletions.
diff --git a/.github/actions/install-apt-packages/action.yml b/.github/actions/install-apt-packages/action.yml
diff --git a/.github/workflows/address-sanitizers.yaml b/.github/workflows/address-sanitizers.yaml
@@ -37,10 +37,19 @@ jobs:
         FASTDDS_BRANCH: ${{ github.head_ref || github.event.inputs.fastdds_branch || '2.12.x' }}
 
     steps:
-      - name: Install wget
+      # https://github.com/actions/runner-images/issues/9491
+      - name: Fix kernel mmap rnd bits
+        run: sudo sysctl vm.mmap_rnd_bits=28
+
+      - name: Install apt packages
         uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0
         with:
-          packages: wget
+          packages: curl grep libasio-dev libtinyxml2-dev python3 python3-pip software-properties-common wget
+
+      - name: Get minimum supported version of CMake
+        uses: eProsima/eProsima-CI/external/get-cmake@v0
+        with:
+          cmakeVersion: '3.22.6'
 
       - name: Setup CCache
         uses: eProsima/eProsima-CI/external/setup-ccache-action@v0
@@ -72,13 +81,12 @@ jobs:
           cd ./src/fastrtps
           git checkout ${{ env.FASTDDS_BRANCH }}
 
-      - name: Install apt packages
-        uses: ./src/fastrtps/.github/actions/install-apt-packages
-
-      - name: Install GTest
-        uses: eProsima/eProsima-CI/ubuntu/install_gtest@v0
+      - name: Fetch Fast DDS ASan dependencies
+        uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0
         with:
-          version: v1.12.1
+          vcs_repos_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/asan.repos
+          destination_workspace: src
+          skip_existing: 'true'
 
       - name: Build workspace
         run: |
@@ -126,10 +134,22 @@ jobs:
       DEFAULT_DISCOVERY_SERVER_BRANCH: ${{ github.event.inputs.discovery_server_branch || 'v1.2.2' }}
 
     steps:
-      - name: Install wget
+      # https://github.com/actions/runner-images/issues/9491
+      - name: Fix kernel mmap rnd bits
+        run: sudo sysctl vm.mmap_rnd_bits=28
+
+      - name: Install apt packages
         uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0
         with:
-          packages: wget
+          packages: curl grep libasio-dev libtinyxml2-dev python3 python3-pip software-properties-common wget
+
+      - name: Get minimum supported version of CMake
+        uses: eProsima/eProsima-CI/external/get-cmake@v0
+        with:
+          cmakeVersion: '3.22.6'
+
+      - name: Setup CCache
+        uses: eProsima/eProsima-CI/external/setup-ccache-action@v0
 
       - name: Install colcon
         uses: eProsima/eProsima-CI/ubuntu/install_colcon@v0
@@ -165,13 +185,12 @@ jobs:
           repository: eProsima/Discovery-Server
           ref: ${{ env.DEFAULT_DISCOVERY_SERVER_BRANCH }}
 
-      - name: Install apt packages
-        uses: ./src/fastrtps/.github/actions/install-apt-packages
-
-      - name: Install GTest
-        uses: eProsima/eProsima-CI/ubuntu/install_gtest@v0
+      - name: Fetch Fast DDS ASan dependencies
+        uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0
         with:
-          version: v1.12.1
+          vcs_repos_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/asan.repos
+          destination_workspace: src
+          skip_existing: 'true'
 
       - name: Build workspace
         run: |

diff --git a/.github/workflows/config/asan.repos b/.github/workflows/config/asan.repos
@@ -0,0 +1,5 @@
+repositories:
+    googletest-distribution:
+        type: git
+        url: https://github.com/google/googletest.git
+        version: release-1.12.1
diff --git a/.github/workflows/config/asan_colcon.meta b/.github/workflows/config/asan_colcon.meta
@@ -17,3 +17,8 @@ names:
         cmake-args:
             - "-DCMAKE_BUILD_TYPE=Debug"
             - "-DSANITIZER=Address"
+    googletest-distribution:
+        cmake-args:
+            - "-Dgtest_force_shared_crt=ON"
+            - "-DBUILD_SHARED_LIBS=ON"
+            - "-DBUILD_GMOCK=ON"
diff --git a/.github/workflows/config/tsan_colcon.meta b/.github/workflows/config/tsan_colcon.meta
@@ -1,7 +1,7 @@
 names:
     fastcdr:
         cmake-args:
-            - "-DCMAKE_C_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'",
+            - "-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:
@@ -17,3 +17,8 @@ names:
             - "-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'"
+    googletest-distribution:
+        cmake-args:
+            - "-Dgtest_force_shared_crt=ON"
+            - "-DBUILD_SHARED_LIBS=ON"
+            - "-DBUILD_GMOCK=ON"
diff --git a/.github/workflows/reusable-mac-ci.yml b/.github/workflows/reusable-mac-ci.yml
@@ -55,7 +55,7 @@ jobs:
           python-version: '3.11'
 
       - name: Get minimum supported version of CMake
-        uses: lukka/get-cmake@latest
+        uses: eProsima/eProsima-CI/external/get-cmake@v0
         with:
           cmakeVersion: '3.20.6'
 

diff --git a/.github/workflows/reusable-ubuntu-ci.yml b/.github/workflows/reusable-ubuntu-ci.yml
@@ -49,7 +49,7 @@ jobs:
           ref: ${{ inputs.fastdds-branch }}
 
       - name: Get minimum supported version of CMake
-        uses: lukka/get-cmake@latest
+        uses: eProsima/eProsima-CI/external/get-cmake@v0
         with:
           cmakeVersion: '3.22.6'
 

diff --git a/.github/workflows/reusable-windows-ci.yml b/.github/workflows/reusable-windows-ci.yml
@@ -49,7 +49,7 @@ jobs:
           ref: ${{ inputs.fastdds_branch }}
 
       - name: Get minimum supported version of CMake
-        uses: lukka/get-cmake@latest
+        uses: eProsima/eProsima-CI/external/get-cmake@v0
         with:
           cmakeVersion: '3.20.6'
 

diff --git a/.github/workflows/thread-sanitizer.yaml b/.github/workflows/thread-sanitizer.yaml
@@ -47,10 +47,19 @@ jobs:
         CXX: g++-12
 
     steps:
-      - name: Install wget
+      # https://github.com/actions/runner-images/issues/9491
+      - name: Fix kernel mmap rnd bits
+        run: sudo sysctl vm.mmap_rnd_bits=28
+
+      - name: Install apt packages
         uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0
         with:
-          packages: wget
+          packages: curl grep libasio-dev libtinyxml2-dev python3 python3-pip software-properties-common wget
+
+      - name: Get minimum supported version of CMake
+        uses: eProsima/eProsima-CI/external/get-cmake@v0
+        with:
+          cmakeVersion: '3.22.6'
 
       - name: Setup CCache
         uses: eProsima/eProsima-CI/external/setup-ccache-action@v0
@@ -82,13 +91,12 @@ jobs:
           cd ./src/fastrtps
           git checkout ${{ env.FASTDDS_BRANCH }}
 
-      - name: Install apt packages
-        uses: ./src/fastrtps/.github/actions/install-apt-packages
-
-      - name: Install GTest
-        uses: eProsima/eProsima-CI/ubuntu/install_gtest@v0
+      - name: Fetch Fast DDS CI dependencies
+        uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0
         with:
-          version: release-1.11.0
+          vcs_repos_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/ci.repos
+          destination_workspace: src
+          skip_existing: 'true'
 
       - name: Build workspace
         run: |