Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[19452] Fix 3.0.x rebase workflow #4323

Merged
merged 1 commit into from
Jan 30, 2024
Merged

[19452] Fix 3.0.x rebase workflow #4323

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .github/workflows/rebase-3.0.x-devel.yaml
View file
Open in desktop
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
Loading