Skip to content

Commit

Permalink
Remove 2.13.x from CI (#175)
Browse files Browse the repository at this point in the history
Signed-off-by: JesusPoderoso <[email protected]>
  • Loading branch information
JesusPoderoso authored Jul 23, 2024
1 parent 375d310 commit f123d9d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 13 deletions.
10 changes: 2 additions & 8 deletions .github/workflows/ubuntu-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,24 +52,18 @@ concurrency:

jobs:
ubuntu-ci:
strategy:
fail-fast: false
matrix:
fastdds-branch:
- '2.14.x'
- '2.13.x'
if: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') }}
uses: ./.github/workflows/reusable-ubuntu-ci.yml
with:
# It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
os-version: ${{ inputs.os-version || 'ubuntu-22.04' }}
label: 'ubuntu-ci-1.4.x-${{ matrix.fastdds-branch }}'
label: 'ubuntu-ci-1.4.x'
colcon-args: ${{ inputs.colcon-args }}
cmake-args: ${{ inputs.cmake-args }}
ctest-args: ${{ inputs.ctest-args }}
fastdds-python-branch: ${{ inputs.fastdds-python-branch || github.ref }}
fastdds-branch: ${{ inputs.fastdds-branch || matrix.fastdds-branch }}
fastdds-branch: ${{ inputs.fastdds-branch || '2.14.x' }}
run-build: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'skip-ci') }}
run-tests: ${{ (inputs.run-tests == true) || ((github.event_name == 'pull_request') && (!contains(github.event.pull_request.labels.*.name, 'no-test'))) }}
use-ccache: ${{ inputs.use-ccache || false }}
7 changes: 2 additions & 5 deletions .github/workflows/windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,21 +59,18 @@ jobs:
vs-toolset:
- 'v141'
- 'v142'
fastdds-branch:
- '2.14.x'
- '2.13.x'
if: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') }}
uses: ./.github/workflows/reusable-windows-ci.yml
with:
# It would be desirable to have a matrix of windows OS for this job, but due to the issue opened in this ticket:
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
os-version: ${{ inputs.os-version || 'windows-2019' }}
vs-toolset: ${{ inputs.vs-toolset || matrix.vs-toolset }}
label: 'windows-${{ matrix.vs-toolset }}-ci-1.4.x-${{ matrix.fastdds-branch }}'
label: 'windows-${{ matrix.vs-toolset }}-ci-1.4.x'
colcon-args: ${{ inputs.colcon-args }}
cmake-args: ${{ inputs.cmake-args }}
ctest-args: ${{ inputs.ctest-args }}
fastdds-python-branch: ${{ inputs.fastdds-python-branch || github.ref }}
fastdds-branch: ${{ inputs.fastdds-branch || matrix.fastdds-branch }}
fastdds-branch: ${{ inputs.fastdds-branch || '2.14.x' }}
run-build: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'skip-ci') }}
run-tests: ${{ (inputs.run-tests == true) || ((github.event_name == 'pull_request') && (!contains(github.event.pull_request.labels.*.name, 'no-test'))) }}

0 comments on commit f123d9d

Please sign in to comment.