From a8019087c203dcf2a1c373846d075e02cd75ff49 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Tue, 30 Jan 2024 07:02:36 +0100 Subject: [PATCH] Refs #19452: Fix 3.0.x workflows Signed-off-by: EduPonz --- .github/workflows/nightly-windows-ci.yml | 2 +- .github/workflows/rebase-3.0.x-devel.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nightly-windows-ci.yml b/.github/workflows/nightly-windows-ci.yml index 9ff975b0f55..ebc01791750 100644 --- a/.github/workflows/nightly-windows-ci.yml +++ b/.github/workflows/nightly-windows-ci.yml @@ -22,7 +22,7 @@ jobs: ctest-args: "-LE xfail" fastdds_branch: 'master' - nightly-3.0.x-windows-ci: + nightly-3_0_x-windows-ci: uses: ./.github/workflows/reusable-windows-ci.yml with: label: 'nightly-3.0.x-windows-ci' diff --git a/.github/workflows/rebase-3.0.x-devel.yaml b/.github/workflows/rebase-3.0.x-devel.yaml index 28671f59222..0addab55ddc 100644 --- a/.github/workflows/rebase-3.0.x-devel.yaml +++ b/.github/workflows/rebase-3.0.x-devel.yaml @@ -11,7 +11,7 @@ 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 @@ -24,8 +24,8 @@ jobs: - name: Rebase current branch id: rebase_master run: | - git fetch master - git rebase master + git fetch origin master + git rebase origin/master shell: bash # Step 3: Push