Skip to content

Commit 7797ae5

Browse files
committed
Refs #21310: Remove 2.13.x from CI
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
1 parent 604a11f commit 7797ae5

2 files changed

Lines changed: 4 additions & 13 deletions

File tree

.github/workflows/ubuntu-ci.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,24 +52,18 @@ concurrency:
5252

5353
jobs:
5454
ubuntu-ci:
55-
strategy:
56-
fail-fast: false
57-
matrix:
58-
fastdds-branch:
59-
- '2.14.x'
60-
- '2.13.x'
6155
if: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') }}
6256
uses: ./.github/workflows/reusable-ubuntu-ci.yml
6357
with:
6458
# It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
6559
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
6660
os-version: ${{ inputs.os-version || 'ubuntu-22.04' }}
67-
label: 'ubuntu-ci-1.4.x-${{ matrix.fastdds-branch }}'
61+
label: 'ubuntu-ci-1.4.x'
6862
colcon-args: ${{ inputs.colcon-args }}
6963
cmake-args: ${{ inputs.cmake-args }}
7064
ctest-args: ${{ inputs.ctest-args }}
7165
fastdds-python-branch: ${{ inputs.fastdds-python-branch || github.ref }}
72-
fastdds-branch: ${{ inputs.fastdds-branch || matrix.fastdds-branch }}
66+
fastdds-branch: ${{ inputs.fastdds-branch || '2.14.x' }}
7367
run-build: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'skip-ci') }}
7468
run-tests: ${{ (inputs.run-tests == true) || ((github.event_name == 'pull_request') && (!contains(github.event.pull_request.labels.*.name, 'no-test'))) }}
7569
use-ccache: ${{ inputs.use-ccache || false }}

.github/workflows/windows-ci.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,21 +59,18 @@ jobs:
5959
vs-toolset:
6060
- 'v141'
6161
- 'v142'
62-
fastdds-branch:
63-
- '2.14.x'
64-
- '2.13.x'
6562
if: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') }}
6663
uses: ./.github/workflows/reusable-windows-ci.yml
6764
with:
6865
# It would be desirable to have a matrix of windows OS for this job, but due to the issue opened in this ticket:
6966
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
7067
os-version: ${{ inputs.os-version || 'windows-2019' }}
7168
vs-toolset: ${{ inputs.vs-toolset || matrix.vs-toolset }}
72-
label: 'windows-${{ matrix.vs-toolset }}-ci-1.4.x-${{ matrix.fastdds-branch }}'
69+
label: 'windows-${{ matrix.vs-toolset }}-ci-1.4.x'
7370
colcon-args: ${{ inputs.colcon-args }}
7471
cmake-args: ${{ inputs.cmake-args }}
7572
ctest-args: ${{ inputs.ctest-args }}
7673
fastdds-python-branch: ${{ inputs.fastdds-python-branch || github.ref }}
77-
fastdds-branch: ${{ inputs.fastdds-branch || matrix.fastdds-branch }}
74+
fastdds-branch: ${{ inputs.fastdds-branch || '2.14.x' }}
7875
run-build: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'skip-ci') }}
7976
run-tests: ${{ (inputs.run-tests == true) || ((github.event_name == 'pull_request') && (!contains(github.event.pull_request.labels.*.name, 'no-test'))) }}

0 commit comments

Comments
 (0)