Skip to content

Commit

Permalink
Fix nightly job and move 2.6.x to weekly CI (#92)
Browse files Browse the repository at this point in the history
* Refs #21230: Fix nightly job

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #21230: Move 2.6.x related job to weekly

Signed-off-by: JesusPoderoso <[email protected]>

---------

Signed-off-by: JesusPoderoso <[email protected]>
  • Loading branch information
JesusPoderoso authored Jul 5, 2024
1 parent 1db8cbd commit 3c21a76
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 13 deletions.
20 changes: 7 additions & 13 deletions .github/workflows/nightly-ubuntu-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
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-image: 'ubuntu-22.04'
os-version: 'ubuntu-22.04'
label: 'nightly-ubuntu-ci-master'
discovery-server-branch: 'master'
fastdds-branch: 'master'
Expand All @@ -31,7 +31,7 @@ jobs:
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-image: 'ubuntu-22.04'
os-version: 'ubuntu-22.04'
label: 'nightly-ubuntu-ci-v1.2.2-${{ matrix.fastdds-branch }}'
discovery-server-branch: 'v1.2.2'
fastdds-branch: ${{ matrix.fastdds-branch }}
Expand All @@ -41,20 +41,14 @@ jobs:
use-ccache: false

nightly-ubuntu-ci-v1_2_1:
strategy:
fail-fast: false
matrix:
setup:
- os-image: 'ubuntu-22.04'
fastdds-branch: '2.10.x'
- os-image: 'ubuntu-20.04'
fastdds-branch: '2.6.x'
uses: eProsima/Discovery-Server/.github/workflows/[email protected]
with:
os-image: ${{ matrix.setup.os-image }}
label: 'nightly-ubuntu-ci-v1.2.1-${{ matrix.setup.fastdds-branch }}'
# 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: 'ubuntu-22.04'
label: 'nightly-ubuntu-ci-v1.2.1-2.10.x'
discovery-server-branch: 'v1.2.1'
fastdds-branch: ${{ matrix.setup.fastdds-branch }}
fastdds-branch: '2.10.x'
ctest-args: "-LE xfail"
run-build: true
run-tests: true
Expand Down
21 changes: 21 additions & 0 deletions .github/workflows/weekly-ubuntu-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Fast DDS Discovery Server Ubuntu CI (weekly)

on:
workflow_dispatch:
schedule:
- cron: '0 * * * 1' # Run at minute 0 on Monday

jobs:
weekly-ubuntu-ci-v1_2_1:
uses: eProsima/Discovery-Server/.github/workflows/[email protected]
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: 'ubuntu-20.04'
label: 'weekly-ubuntu-ci-v1.2.1-2.6.x'
discovery-server-branch: 'v1.2.1'
fastdds-branch: '2.6.x'
ctest-args: "-LE xfail"
run-build: true
run-tests: true
use-ccache: false

0 comments on commit 3c21a76

Please sign in to comment.