From a9e1f7d6ad38648349ac47c03f581c40779dcf46 Mon Sep 17 00:00:00 2001 From: jparisu Date: Fri, 13 May 2022 12:30:17 +0200 Subject: [PATCH 1/4] Refs #14568: Refactor CI so every job uses ubuntu 20.04 and add job for ubuntu 22.04 Signed-off-by: jparisu --- .github/workflows/test.yml | 59 ++++++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5d503a565..6d2f0344d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,3 +1,38 @@ +# Main CI for DDS Router repository +# This is executed with every PullRequest (new or update), any merge in main and every night +# +# These jobs that require to install fastrtps library uses the artifact generated for the nightly job +# so they do not have to compile the whole fastrtps project. This saves huge amount of time. +# +# JOBS: +# - windows-build-test +# - windows-latest +# - [Debug | Release] +# - compile up-to ddsrouter_tool ; run tests +# - ubuntu-main-test +# - ubuntu-20.04 +# - Debug +# - compile all ; run tests ; calculate coverage +# - ubuntu-release-test +# - [ ubuntu-20.04 | ubuntu-22.04 ] +# - Release +# - compile all ; run tests +# - ubuntu-build-test-flaky +# - ubuntu-20.04 +# - Debug +# - compile all ; run flaky tests +# - clang-tidy +# - ubuntu-20.04 +# - Release +# - compile all ; test clang-tidy +# - uncrustify +# - ubuntu-20.04 +# - test uncrustify +# +# The main job is ubuntu-main-test which compiles all packages (including documentation), run every test and calculates coverage. +# This main job uses ubuntu 20.04 LTS (focal fossa). +# + name: test on: @@ -121,8 +156,8 @@ jobs: cmake_build_type: ${{ matrix.cmake-config }} if: always() - ubuntu-build-test: - runs-on: ubuntu-latest + ubuntu-main-test: + runs-on: ubuntu-20.04 environment: name: codecov @@ -153,7 +188,7 @@ jobs: with: workflow: build_fastdds.yml path: /home/runner/work/fastdds/install - name: ubuntu_fastdds_install + name: ubuntu-20.04_fastdds_install run_id: ${{ env.fastdds_job_id }} - name: Update colcon mixin @@ -261,10 +296,15 @@ jobs: path: log/ if: always() + ubuntu-release-test: runs-on: ubuntu-latest environment: name: codecov + matrix: + ubuntu-version: + - 'ubuntu-20.04' + - 'ubuntu-22.04' steps: - name: Sync eProsima/DDS-Router repository @@ -293,7 +333,7 @@ jobs: with: workflow: build_fastdds.yml path: /home/runner/work/fastdds/install - name: ubuntu_fastdds_install + name: ${{ matrix.ubuntu-version }}_fastdds_install run_id: ${{ env.fastdds_job_id }} - name: Update colcon mixin @@ -330,8 +370,9 @@ jobs: path: log/ if: always() + ubuntu-build-test-flaky: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 environment: name: codecov @@ -360,7 +401,7 @@ jobs: with: workflow: build_fastdds.yml path: /home/runner/work/fastdds/install - name: ubuntu_fastdds_install + name: ubuntu-20.04_fastdds_install run_id: ${{ env.fastdds_job_id }} - name: Update colcon mixin @@ -392,7 +433,7 @@ jobs: --timeout 60 clang-tidy: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Sync eProsima/DDS-Router repository uses: actions/checkout@v2 @@ -418,7 +459,7 @@ jobs: with: workflow: build_fastdds.yml path: /home/runner/work/fastdds/install - name: ubuntu_fastdds_install + name: ubuntu-20.04_fastdds_install run_id: ${{ env.fastdds_job_id }} - name: Build workspace @@ -443,7 +484,7 @@ jobs: path: ${{ github.workspace }}/clang_results.yml uncrustify: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Sync eProsima/DDS-Router repository uses: actions/checkout@v2 From dbfc64621bebd4bccef386033601d6c82ecd1739 Mon Sep 17 00:00:00 2001 From: jparisu Date: Fri, 17 Jun 2022 10:05:17 +0200 Subject: [PATCH 2/4] Refs #14568: add windows 19 and 22 support Signed-off-by: jparisu --- .github/workflows/test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6d2f0344d..98536c720 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,7 +31,6 @@ # # The main job is ubuntu-main-test which compiles all packages (including documentation), run every test and calculates coverage. # This main job uses ubuntu 20.04 LTS (focal fossa). -# name: test @@ -54,6 +53,9 @@ jobs: cmake-config: - 'Release' - 'Debug' + windows-version: + - 'windows-2019' + - 'windows-latest' env: CXXFLAGS: /MP OPENSSL64_ROOT: "C:/Program Files/OpenSSL-Win64" @@ -90,7 +92,7 @@ jobs: with: workflow: build_fastdds.yml path: ${{ github.workspace }}\..\fastdds\install - name: windows_${{ matrix.cmake-config }}_fastdds_install + name: ${{ matrix.windows-version }}_${{ matrix.cmake-config }}_fastdds_install run_id: ${{ env.fastdds_job_id }} - name: Install ddsrouter_cmake From c176be0653de684355598af6de4f0330ac5e37c1 Mon Sep 17 00:00:00 2001 From: jparisu Date: Fri, 17 Jun 2022 11:30:59 +0200 Subject: [PATCH 3/4] Refs #14568: fix test.yaml Signed-off-by: jparisu --- .github/workflows/test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 98536c720..ff34e33ff 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -301,8 +301,7 @@ jobs: ubuntu-release-test: runs-on: ubuntu-latest - environment: - name: codecov + strategy: matrix: ubuntu-version: - 'ubuntu-20.04' From 752d69a0cd0262aaf2d6a85aaec3b5f5904cd6a8 Mon Sep 17 00:00:00 2001 From: RaulSanchez Date: Thu, 23 Jun 2022 09:27:28 +0200 Subject: [PATCH 4/4] Fix ubuntu-release-test version Signed-off-by: RaulSanchez --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ff34e33ff..ebe355045 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -300,7 +300,7 @@ jobs: ubuntu-release-test: - runs-on: ubuntu-latest + runs-on: ${{ matrix.ubuntu-version }} strategy: matrix: ubuntu-version: