diff --git a/.github/workflows/nightly-windows-ci.yml b/.github/workflows/nightly-windows-ci.yml index 50d96558717..9ff975b0f55 100644 --- a/.github/workflows/nightly-windows-ci.yml +++ b/.github/workflows/nightly-windows-ci.yml @@ -21,3 +21,11 @@ jobs: cmake-args: "-DSECURITY=OFF" ctest-args: "-LE xfail" fastdds_branch: 'master' + + nightly-3.0.x-windows-ci: + uses: ./.github/workflows/reusable-windows-ci.yml + with: + label: 'nightly-3.0.x-windows-ci' + cmake-args: "-DSECURITY=ON" + ctest-args: "-LE xfail" + fastdds_branch: '3.0.x-devel' diff --git a/.github/workflows/rebase-3.0.x-devel.yaml b/.github/workflows/rebase-3.0.x-devel.yaml new file mode 100644 index 00000000000..28671f59222 --- /dev/null +++ b/.github/workflows/rebase-3.0.x-devel.yaml @@ -0,0 +1,38 @@ +name: rebase-3.0.x-devel-master + +on: + schedule: + - cron: '0 0 * * *' + # scheduled every midnight + workflow_dispatch: + #manual run of the workflow job + +jobs: + rebase-branches: + name: Rebase 3.0.x-devel branch HEAD with master current branch + runs-on: ubuntu-latest + + steps: + # Step 1: checkout action + - name: Checkout target repo + uses: eProsima/eProsima-CI/external/checkout@v0 + with: + ref: 3.0.x-devel + fetch-depth: 0 + + # Step 2: Rebase + - name: Rebase current branch + id: rebase_master + run: | + git fetch master + git rebase master + shell: bash + + # Step 3: Push + - name: Force push if required + id: push + run: | + if [ "$(git status | grep 'diverged\|ahead')" ]; then + git push -f + fi; + shell: bash