From 74abc8090ee4daff0bdf4d03bdddcde2342bc4c9 Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Wed, 2 Oct 2024 13:55:44 +0200 Subject: [PATCH] Branch out 3.0.x (#924) * Refs #21784. Remove mirror and periodic workflows. Signed-off-by: Miguel Company * Refs #21784. Update top branch in CI workflows. Signed-off-by: Miguel Company --------- Signed-off-by: Miguel Company --- .github/workflows/mirror.yml | 25 ------------- .github/workflows/nightly-ubuntu-ci.yml | 49 ------------------------- .github/workflows/ubuntu-ci.yml | 6 +-- .github/workflows/weekly-ubuntu-ci.yml | 21 ----------- 4 files changed, 3 insertions(+), 98 deletions(-) delete mode 100644 .github/workflows/mirror.yml delete mode 100644 .github/workflows/nightly-ubuntu-ci.yml delete mode 100644 .github/workflows/weekly-ubuntu-ci.yml diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml deleted file mode 100644 index db69de3f5..000000000 --- a/.github/workflows/mirror.yml +++ /dev/null @@ -1,25 +0,0 @@ -# .github/workflows/mirror.yml -name: Mirror -on: - push: - branches: - - 'master' - -jobs: - mirror_job: - name: Mirror master branch to latest minor branches - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - dest_branch: - - '3.0.x' - - '3.x' - steps: - - name: Mirror action step - id: mirror - uses: eProsima/eProsima-CI/external/mirror-branch-action@main - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - source: 'master' - dest: ${{ matrix.dest_branch }} diff --git a/.github/workflows/nightly-ubuntu-ci.yml b/.github/workflows/nightly-ubuntu-ci.yml deleted file mode 100644 index 21572e35e..000000000 --- a/.github/workflows/nightly-ubuntu-ci.yml +++ /dev/null @@ -1,49 +0,0 @@ -name: Fast DDS Docs Ubuntu CI (nightly) - -on: - workflow_dispatch: - schedule: - - cron: '0 1 * * *' - -jobs: - nightly-ubuntu-ci-master: - uses: eProsima/Fast-DDS-docs/.github/workflows/reusable-ubuntu-ci.yml@master - 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-24.04' - label: 'nightly-ubuntu-ci-master' - fastdds-docs-branch: 'master' - fastdds-branch: 'master' - fastdds-python-branch: 'main' - run-build: true - run-tests: true - use-ccache: false - - nightly-ubuntu-ci-2_14_x: - uses: eProsima/Fast-DDS-docs/.github/workflows/reusable-ubuntu-ci.yml@2.14.x - 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-22.04' - label: '-nightly-ubuntu-ci-2.14.x' - fastdds-docs-branch: '2.14.x' - fastdds-branch: '2.14.x' - fastdds-python-branch: '1.4.x' - run-build: true - run-tests: true - use-ccache: false - - nightly-ubuntu-ci-2_10_x: - uses: eProsima/Fast-DDS-docs/.github/workflows/reusable-ubuntu-ci.yml@2.10.x - 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-22.04' - label: '-nightly-ubuntu-ci-2.10.x' - fastdds-docs-branch: '2.10.x' - fastdds-branch: '2.10.x' - fastdds-python-branch: '1.2.x' - run-build: true - run-tests: true - use-ccache: false diff --git a/.github/workflows/ubuntu-ci.yml b/.github/workflows/ubuntu-ci.yml index 9ec5d1308..2b4dc91cf 100644 --- a/.github/workflows/ubuntu-ci.yml +++ b/.github/workflows/ubuntu-ci.yml @@ -62,13 +62,13 @@ jobs: # 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-24.04' }} - label: 'ubuntu-ci-master-main' + label: 'ubuntu-ci-3.0.x-2.0.x' colcon-args: ${{ inputs.colcon-args }} cmake-args: ${{ inputs.cmake-args }} ctest-args: ${{ inputs.ctest-args }} fastdds-docs-branch: ${{ inputs.fastdds-docs-branch || github.ref }} - fastdds-branch: ${{ inputs.fastdds-branch || 'master' }} - fastdds-python-branch: ${{ inputs.fastdds-python-branch || 'main' }} + fastdds-branch: ${{ inputs.fastdds-branch || '3.0.x' }} + fastdds-python-branch: ${{ inputs.fastdds-python-branch || '2.0.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 }} diff --git a/.github/workflows/weekly-ubuntu-ci.yml b/.github/workflows/weekly-ubuntu-ci.yml deleted file mode 100644 index 932b7e13e..000000000 --- a/.github/workflows/weekly-ubuntu-ci.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Fast DDS Docs Ubuntu CI (weekly) - -on: - workflow_dispatch: - schedule: - - cron: '0 0 * * 1' # Run at minute 0 on Monday - -jobs: - weekly-ubuntu-ci-2_6_x: - uses: eProsima/Fast-DDS-docs/.github/workflows/reusable-ubuntu-ci.yml@2.6.x - 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-2.6.x' - fastdds-docs-branch: '2.6.x' - fastdds-branch: '2.6.x' - fastdds-python-branch: '1.0.x' - run-build: true - run-tests: true - use-ccache: false