From 6223853c030b29734e98b4851ac6ed350954bf11 Mon Sep 17 00:00:00 2001 From: Raul Sanchez-Mateos Date: Tue, 17 Sep 2024 07:56:16 +0200 Subject: [PATCH 1/2] Add mirror workflow Signed-off-by: Raul Sanchez-Mateos --- .github/workflows/mirror.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/mirror.yml diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml new file mode 100644 index 00000000..a7084655 --- /dev/null +++ b/.github/workflows/mirror.yml @@ -0,0 +1,25 @@ +name: mirror-branch + +on: + push: + branches: + - 'main' + +jobs: + mirror_job_main: + if: github.ref == 'refs/heads/main' + runs-on: ubuntu-latest + name: Mirror main branch to API & ABI compatible minor version branches + strategy: + fail-fast: false + matrix: + dest_branch: + - '1.x' + steps: + - name: Mirror action step + id: mirror + uses: eProsima/eProsima-CI/external/mirror-branch-action@v0 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + source: 'main' + dest: ${{ matrix.dest_branch }} From 6b49aa33dbc63eaa4493940464e67d61b42a6a52 Mon Sep 17 00:00:00 2001 From: Raul Sanchez-Mateos Date: Tue, 17 Sep 2024 08:03:55 +0200 Subject: [PATCH 2/2] Fix duplicated names Signed-off-by: Raul Sanchez-Mateos --- .github/workflows/reusable-workflow.yml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reusable-workflow.yml b/.github/workflows/reusable-workflow.yml index ef5a5f55..ddb67040 100644 --- a/.github/workflows/reusable-workflow.yml +++ b/.github/workflows/reusable-workflow.yml @@ -109,6 +109,7 @@ jobs: workspace_dependencies: './install' ctest_args: --label-exclude "xfail" colcon_meta_file: ./src/.github/workflows/configurations/${{ runner.os }}/colcon.meta + test_report_artifact: test_report${{ inputs.dependencies_artifact_postfix }}_${{ inputs.custom_version_build }}_${{ matrix.os }}_${{ matrix.cmake_build_type }} ##################################################################### @@ -134,10 +135,14 @@ jobs: secret_token: ${{ secrets.GITHUB_TOKEN }} - name: Compile and run tests - uses: eProsima/eProsima-CI/multiplatform/asan_build_test@v0 + uses: eProsima/eProsima-CI/multiplatform/colcon_build_test@v0 with: packages_names: ${{ env.code_packages_names }} + cmake_args: -DBUILD_TESTS=ON -DASAN_BUILD=ON + ctest_args: --label-exclude "xfail|xasan" workspace_dependencies: './install' + cmake_build_type: Debug + test_report_artifact: test_report${{ inputs.dependencies_artifact_postfix }}_${{ inputs.custom_version_build }}_${{ matrix.os }}_${{ matrix.cmake_build_type }} ##################################################################### @@ -163,10 +168,19 @@ jobs: secret_token: ${{ secrets.GITHUB_TOKEN }} - name: Compile and run tests - uses: eProsima/eProsima-CI/multiplatform/tsan_build_test@v0 + uses: eProsima/eProsima-CI/multiplatform/colcon_build_test@v0 + env: + # GCC 11.3 (Ubuntu Jammy default) produces several false positives regarding timed synchronization protocols + # These issues were fixed in GCC 12 so we upgrade to that version. + CC: gcc-12 + CXX: g++-12 with: packages_names: ${{ env.code_packages_names }} + cmake_args: -DBUILD_TESTS=ON -DTSAN_BUILD=ON + ctest_args: --label-exclude "xfail|xtsan" workspace_dependencies: './install' + cmake_build_type: Debug + test_report_artifact: test_report_tsan${{ inputs.dependencies_artifact_postfix }}_${{ inputs.custom_version_build }} ##################################################################### @@ -229,6 +243,7 @@ jobs: workspace_dependencies: './install' codecov_token: ${{ secrets.CODECOV_TOKEN }} codecov_fix_file_path: ./src/codecov.yml + test_report_artifact: test_report_coverage${{ inputs.dependencies_artifact_postfix }}_${{ inputs.custom_version_build }} #####################################################################