Skip to content

Commit

Permalink
Refs #19452: fix 3.0.x rebase workflow
Browse files Browse the repository at this point in the history
Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
  • Loading branch information
JLBuenoLopez committed Jan 30, 2024
1 parent c228bd5 commit 32e8fdc
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions .github/workflows/rebase-3.0.x-devel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,25 @@ jobs:
with:
ref: 3.0.x-devel
fetch-depth: 0
persist-credentials: true

# Step 2: Rebase
# Step 2: Set git config
- name: Set git config
id: config
run: |
git config --local user.email "ricardogonzalez@eprosima.com"
git config --local user.name "richiprosima"
shell: bash

# Step 3: Rebase
- name: Rebase current branch
id: rebase_master
run: |
git fetch origin master
git rebase origin/master
shell: bash

# Step 3: Push
# Step 4: Push
- name: Force push if required
id: push
run: |
Expand Down

0 comments on commit 32e8fdc

Please sign in to comment.