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.

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

ci: auto backport squashed commits based on labels #26622

Merged
merged 1 commit into from
Jul 25, 2021

Conversation

ankush
Copy link
Member

@ankush ankush commented Jul 25, 2021

Workflow to auto backport squashed PR merges.

Use this label scheme for creating backports: backport <branchname>

Example : backport version-13-hotfix


Credit:

This is based on work of https://github.com/tibdex/backport with subsequent modification from https://github.com/grafana/grafana-github-actions (which in turn is based on https://github.com/microsoft/vscode-github-triage-actions)

All repos are licensed under MIT License.

@ankush
Copy link
Member Author

ankush commented Jul 25, 2021

will move the workflow action to frappe org once it's stable.

@ankush ankush merged commit 057a0a9 into frappe:develop Jul 25, 2021
@frappe frappe deleted a comment from frappe-pr-bot Jul 25, 2021
@ankush ankush deleted the auto_backport branch July 25, 2021 07:22
frappe-pr-bot pushed a commit to frappe-pr-bot/erpnext that referenced this pull request Jul 26, 2021
@frappe-pr-bot
Copy link
Collaborator

The backport to version-12-hotfix failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport/version-12-hotfix/26622 origin/version-12-hotfix
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 057a0a98428b138b20646b820e7ab27c99bc5f22
# Push it to GitHub
git push --set-upstream origin backport/version-12-hotfix/26622
git switch main
# Remove the local backport branch
git branch -D backport/version-12-hotfix/26622

Then, create a pull request where the base branch is version-12-hotfix and the compare/head branch is backport/version-12-hotfix/26622.

ankush added a commit that referenced this pull request Jul 26, 2021
(cherry picked from commit 057a0a9)

Co-authored-by: Ankush <ankush@iwebnotes.com>
asoral pushed a commit to asoral/erpnext that referenced this pull request Nov 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants