From 75d6958ad1102814bc9bb8a652a6a305692ae097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Poderoso?= <120394830+JesusPoderoso@users.noreply.github.com> Date: Thu, 14 Mar 2024 07:38:07 +0100 Subject: [PATCH] Fix CI version management (#4484) * Refs #20542: Fix CI version management Signed-off-by: JesusPoderoso Signed-off-by: EduPonz * Refs #20542: Apply internal revision suggestions Signed-off-by: JesusPoderoso Signed-off-by: EduPonz * Refs #20542: Add ignored paths to sanitizer events Signed-off-by: JesusPoderoso Signed-off-by: EduPonz * Refs #20542: Remove nightly files Signed-off-by: JesusPoderoso Signed-off-by: EduPonz * Refs #20542: Remove Windows CI test report Signed-off-by: JesusPoderoso Signed-off-by: EduPonz * Refs #20542: Remove unused action Signed-off-by: JesusPoderoso Signed-off-by: EduPonz * Refs #20542: Address last rev suggestions Signed-off-by: JesusPoderoso Signed-off-by: EduPonz * Refs #20542: Fix input branch on reusable windows CI Signed-off-by: EduPonz * Refs #20542: Manual cherry-pick of PR #4549 Signed-off-by: EduPonz * Refs #20542: Add missing ci.meta Signed-off-by: EduPonz * Refs #20542: Fix metas as yml Signed-off-by: EduPonz * Refs #20542: Fix paths to .metas Signed-off-by: EduPonz --------- Signed-off-by: JesusPoderoso Signed-off-by: EduPonz Co-authored-by: EduPonz --- .../actions/fetch-fastdds-repos/action.yml | 52 --------------- ...zer-tests.yaml => address-sanitizers.yaml} | 12 ++-- .github/workflows/config/asan_colcon.meta | 51 ++++++--------- .../config/{nightly.meta => ci.meta} | 0 .github/workflows/config/ci.repos | 5 ++ .github/workflows/config/default_ci.meta | 29 --------- .../workflows/config/default_ci_2.6.x.repos | 13 ---- .github/workflows/config/nightly_2.6.x.repos | 13 ---- .github/workflows/config/tsan_colcon.meta | 51 ++++++--------- .github/workflows/documentation-tests.yaml | 8 --- .github/workflows/mac-ci.yml | 9 +-- .github/workflows/nightly-mac-ci.yml | 23 ------- .github/workflows/nightly-windows-ci.yml | 23 ------- .github/workflows/reusable-mac-ci.yml | 45 ++++--------- .github/workflows/reusable-ubuntu-ci.yml | 45 ++++--------- .github/workflows/reusable-windows-ci.yml | 63 +++++-------------- .github/workflows/thread-sanitizer.yaml | 8 --- .github/workflows/ubuntu-ci.yml | 4 +- .github/workflows/windows-ci.yml | 9 +-- 19 files changed, 96 insertions(+), 367 deletions(-) delete mode 100644 .github/actions/fetch-fastdds-repos/action.yml rename .github/workflows/{sanitizer-tests.yaml => address-sanitizers.yaml} (98%) rename .github/workflows/config/{nightly.meta => ci.meta} (100%) create mode 100644 .github/workflows/config/ci.repos delete mode 100644 .github/workflows/config/default_ci.meta delete mode 100644 .github/workflows/config/default_ci_2.6.x.repos delete mode 100644 .github/workflows/config/nightly_2.6.x.repos delete mode 100644 .github/workflows/nightly-mac-ci.yml delete mode 100644 .github/workflows/nightly-windows-ci.yml diff --git a/.github/actions/fetch-fastdds-repos/action.yml b/.github/actions/fetch-fastdds-repos/action.yml deleted file mode 100644 index 7a82b434ec7..00000000000 --- a/.github/actions/fetch-fastdds-repos/action.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: 'fetch-fastdds-repos' -description: 'Fetch Fast DDS dependencies' -inputs: - target_directory: - description: 'Target directory where the dependencies will be downloaded.' - required: true - default: '.' - googletest: - description: 'Specifies if GoogleTest repository should be downloaded.' - required: false - default: 'false' - discovery_server: - description: 'Specifies if Discovery Server repository should be downloaded.' - required: false - default: 'false' - discovery_server_branch: - description: 'Specifies Discovery Server branch. The final branch is calculated based on the event that triggers - the action. Thus, if the action has been triggered as a result of a Pull Request, the branch will be the source - branch, the target branch, "master", or the branch specified in this parameter.' - required: false - default: 'master' -runs: - using: "composite" - steps: - - name: Fetch eProsima dependencies - run: | - git clone https://github.com/eProsima/foonathan_memory_vendor.git ${{ inputs.target_directory }}/foonathan_memory_vendor - git clone https://github.com/eProsima/Fast-CDR.git ${{ inputs.target_directory }}/fastcdr - shell: bash - - - name: Fetch GoogleTest - if: ${{ inputs.googletest == 'true' }} - run: git clone https://github.com/google/googletest.git --branch release-1.12.1 ${{ inputs.target_directory }}/googletest - shell: bash - - - name: Fetch Discovery Server - if: ${{ inputs.discovery_server == 'true' }} - run: | - base_dir=${PWD} - git clone https://github.com/eProsima/Discovery-Server.git ${{ inputs.target_directory }}/discovery_server - cd ${{ inputs.target_directory }}/discovery_server - - if [[ $(git rev-parse --verify "${{ github.head_ref }}" 2>/dev/null) ]]; then - git checkout ${{ github.head_ref }} - elif [[ $(git rev-parse --verify "${{ github.base_ref }}" 2>/dev/null) ]]; then - git checkout ${{ github.base_ref }} - else - git checkout ${{ inputs.discovery_server_branch }} - fi - - cd ${base_dir} - shell: bash diff --git a/.github/workflows/sanitizer-tests.yaml b/.github/workflows/address-sanitizers.yaml similarity index 98% rename from .github/workflows/sanitizer-tests.yaml rename to .github/workflows/address-sanitizers.yaml index 3f3481aeec3..9d9663a4313 100644 --- a/.github/workflows/sanitizer-tests.yaml +++ b/.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 index 9ece0c38ed5..f3861032c74 100644 --- 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 b/.github/workflows/config/ci.meta similarity index 100% rename from .github/workflows/config/nightly.meta rename to .github/workflows/config/ci.meta diff --git a/.github/workflows/config/ci.repos b/.github/workflows/config/ci.repos new file mode 100644 index 00000000000..5052ee825f4 --- /dev/null +++ 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 deleted file mode 100644 index 26a40a08ab9..00000000000 --- a/.github/workflows/config/default_ci.meta +++ /dev/null @@ -1,29 +0,0 @@ -names: - fastrtps: - cmake-args: - - "-DBUILD_DOCUMENTATION=OFF" - - "-DBUILD_SHARED_LIBS=ON" - - "-DCOMPILE_EXAMPLES=ON" - - "-DEPROSIMA_BUILD_TESTS=ON" - - "-DFASTDDS_ENFORCE_LOG_INFO=ON" - - "-DFASTDDS_PIM_API_TESTS=ON" - - "-DFASTDDS_STATISTICS=ON" - - "-DFASTRTPS_API_TESTS=OFF" - - "-DGTEST_INDIVIDUAL=ON" - - "-DINSTALL_EXAMPLES=ON" - - "-DINSTALL_TOOLS=ON" - - "-DINTERNAL_DEBUG=ON" - - "-DNO_TLS=OFF" - - "-DPERFORMANCE_TESTS=ON" - - "-DPROFILING_TESTS=OFF" - - "-DSECURITY=ON" - - "-DSHM_TRANSPORT_DEFAULT=ON" - - "-DSTRICT_REALTIME=OFF" - - "-DSYSTEM_TESTS=ON" - - "-DMEMORYCHECK_COMMAND_OPTIONS=-q --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=2 --error-exitcode=1" - - "-DMEMORYCHECK_SUPPRESSIONS_FILE=../../src/fastrtps/valgrind.supp" - googletest-distribution: - cmake-args: - - "-Dgtest_force_shared_crt=ON" - - "-DBUILD_SHARED_LIBS=ON" - - "-DBUILD_GMOCK=ON" diff --git a/.github/workflows/config/default_ci_2.6.x.repos b/.github/workflows/config/default_ci_2.6.x.repos deleted file mode 100644 index dafcf2fd3f7..00000000000 --- a/.github/workflows/config/default_ci_2.6.x.repos +++ /dev/null @@ -1,13 +0,0 @@ -repositories: - fastcdr: - type: git - url: https://github.com/eProsima/Fast-CDR.git - version: 1.0.x - foonathan_memory_vendor: - type: git - url: https://github.com/eProsima/foonathan_memory_vendor.git - version: v1.2.1 - googletest-distribution: - type: git - url: https://github.com/google/googletest.git - version: release-1.11.0 diff --git a/.github/workflows/config/nightly_2.6.x.repos b/.github/workflows/config/nightly_2.6.x.repos deleted file mode 100644 index dafcf2fd3f7..00000000000 --- a/.github/workflows/config/nightly_2.6.x.repos +++ /dev/null @@ -1,13 +0,0 @@ -repositories: - fastcdr: - type: git - url: https://github.com/eProsima/Fast-CDR.git - version: 1.0.x - foonathan_memory_vendor: - type: git - url: https://github.com/eProsima/foonathan_memory_vendor.git - version: v1.2.1 - googletest-distribution: - type: git - url: https://github.com/google/googletest.git - version: release-1.11.0 diff --git a/.github/workflows/config/tsan_colcon.meta b/.github/workflows/config/tsan_colcon.meta index b434c33736c..bfecf695cbe 100644 --- 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 index 8194fd039ac..e9f835980bc 100644 --- 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 index 4e2efa8df09..14152386b71 100644 --- 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 deleted file mode 100644 index fa582890f77..00000000000 --- a/.github/workflows/nightly-mac-ci.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Fast-DDS MacOS CI (nightly) - -on: - workflow_dispatch: - schedule: - - cron: '0 1 * * *' - -jobs: - nightly-sec-mac-ci: - uses: ./.github/workflows/reusable-mac-ci.yml - with: - label: 'nightly-sec-mac-ci' - cmake-args: "-DSECURITY=ON" - ctest-args: "-LE xfail" - fastdds-branch: '2.6.x' - - nightly-nosec-mac-ci: - uses: ./.github/workflows/reusable-mac-ci.yml - with: - label: 'nightly-nosec-mac-ci' - cmake-args: "-DSECURITY=OFF" - ctest-args: "-LE xfail" - fastdds-branch: '2.6.x' diff --git a/.github/workflows/nightly-windows-ci.yml b/.github/workflows/nightly-windows-ci.yml deleted file mode 100644 index 193dd394753..00000000000 --- a/.github/workflows/nightly-windows-ci.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Fast-DDS Windows CI - -on: - workflow_dispatch: - schedule: - - cron: '0 1 * * *' - -jobs: - nightly-sec-windows-ci: - uses: ./.github/workflows/reusable-windows-ci.yml - with: - label: 'nightly-sec-windows-ci' - cmake-args: "-DSECURITY=ON" - ctest-args: "-LE xfail" - fastdds_branch: '2.6.x' - - nightly-nosec-windows-ci: - uses: ./.github/workflows/reusable-windows-ci.yml - with: - label: 'nightly-nosec-windows-ci' - cmake-args: "-DSECURITY=OFF" - ctest-args: "-LE xfail" - fastdds_branch: '2.6.x' diff --git a/.github/workflows/reusable-mac-ci.yml b/.github/workflows/reusable-mac-ci.yml index b9dfe21fa57..e3c7196ded3 100644 --- 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" diff --git a/.github/workflows/reusable-ubuntu-ci.yml b/.github/workflows/reusable-ubuntu-ci.yml index b5804377cd4..a02f9021888 100644 --- a/.github/workflows/reusable-ubuntu-ci.yml +++ b/.github/workflows/reusable-ubuntu-ci.yml @@ -76,44 +76,25 @@ 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_master.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_master.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' - name: Colcon build 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" diff --git a/.github/workflows/reusable-windows-ci.yml b/.github/workflows/reusable-windows-ci.yml index 571e86e71b3..bb6fed4e9e7 100644 --- a/.github/workflows/reusable-windows-ci.yml +++ b/.github/workflows/reusable-windows-ci.yml @@ -46,7 +46,7 @@ jobs: with: path: src/fastrtps submodules: true - ref: ${{ inputs.fastdds-branch }} + ref: ${{ inputs.fastdds_branch }} - name: Get minimum supported version of CMake uses: lukka/get-cmake@latest @@ -115,51 +115,26 @@ jobs: # Show the result gc $hostfile - - name: Prepare colcon workspace - run: | - # Get some convenient tools - Install-Module -Name ConvertBase64Strings -Force -AllowClobber - Import-Module -name ConvertBase64Strings -Prefix CI - Install-Module powershell-yaml -Force - - # Nightly job - if ("${{ inputs.label }}".Contains("nightly")) - { - $depends_repos_path = ".\src\fastrtps\.github\workflows\config\nightly_${{ inputs.fastdds_branch }}.repos" - if (!(Test-Path -Path $depends_repos_path)) - { - $depends_repos_path = ".\src\fastrtps\.github\workflows\config\nightly_2.6.x.repos" - } - $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 (!(Test-Path -Path $depends_repos_path)) - { - $depends_repos_path = ".\src\fastrtps\.github\workflows\config\default_ci_2.6.x.repos" - } - $meta_path = ".\src\fastrtps\.github\workflows\config\default_ci.meta" - } - Write-Output "Selected repos files: $depends_repos_path" - Write-Output "Selected metas files: $meta_path" - - # Generate the meta file - "::group::deployed colcon.meta file" - $meta = Get-Content $meta_path | ConvertFrom-Yaml - $meta | ConvertTo-Json -Depth 3 | Tee-Object -FilePath ci.meta -Encoding OEM - "::endgroup::" + - 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' - name: Build id: build continue-on-error: false uses: eProsima/eProsima-CI/windows/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 }} # The following Fast DDS CMake options need to be specified here instead of in the ci.meta file # because they vary from platform to platform @@ -189,13 +164,3 @@ jobs: show_failed: 'True' show_disabled: 'False' show_skipped: 'False' - - - name: Test Report - uses: eProsima/eProsima-CI/external/test-reporter@v0 - if: ${{ !cancelled() && !contains(github.event.pull_request.labels.*.name, 'no-test') }} - with: - name: "Report: ${{ matrix.cmake-config }} | ${{ matrix.vs-toolset }} " - path: "${{ steps.test.outputs.ctest_results_path }}*.xml" - working-directory: 'src/fastrtps' - path-replace-backslashes: 'true' - list-tests: 'failed' diff --git a/.github/workflows/thread-sanitizer.yaml b/.github/workflows/thread-sanitizer.yaml index 0104ca58baf..df1502bae72 100644 --- a/.github/workflows/thread-sanitizer.yaml +++ b/.github/workflows/thread-sanitizer.yaml @@ -15,14 +15,6 @@ on: required: false type: string - push: - branches: - - '2.6.x' - paths-ignore: - - '**.md' - - '**.txt' - - '!**/CMakeLists.txt' - pull_request: branches: - '2.6.x' diff --git a/.github/workflows/ubuntu-ci.yml b/.github/workflows/ubuntu-ci.yml index 53c0ce76605..ae94ed5ec5e 100644 --- a/.github/workflows/ubuntu-ci.yml +++ b/.github/workflows/ubuntu-ci.yml @@ -42,6 +42,6 @@ jobs: os-image: ${{ matrix.os-image }} label: ${{ inputs.label || 'ubuntu-ci' }} colcon-args: ${{ inputs.colcon-args }} - cmake-args: ${{ inputs.cmake-args || "-DSECURITY=ON" }} - ctest-args: ${{ inputs.ctest-args || "-LE xfail" }} + cmake-args: '-DSECURITY=ON ${{ inputs.cmake-args }}' + ctest-args: ${{ inputs.ctest-args || '-LE xfail' }} fastdds-branch: ${{ inputs.fastdds_branch || github.ref || '2.6.x' }} diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index 7ef565a3c69..dbd7222410d 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-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 || 'windows-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' }}