Skip to content

[backport] #45: Test/fix cherry pick exit code 2 (to 1.1) #46

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

Open
openwisp-companion wants to merge 1 commit into
base: 1.1
Choose a base branch
from
Open

[backport] #45: Test/fix cherry pick exit code 2 (to 1.1) #46

Show file tree
Hide file tree
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
5 changes: 2 additions & 3 deletions .github/workflows/bot-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
name: Changelog Bot

on:
# Trigger when a PR review is submitted with approval
pull_request_review:
types: [submitted]
issue_comment:
types: [created]

jobs:
changelog:
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
test
1 change: 1 addition & 0 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
single tag test
1 change: 1 addition & 0 deletions conflict-test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
stable version
1 change: 1 addition & 0 deletions conflict_test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
different content on main
1 change: 1 addition & 0 deletions test-backport.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fix: scenario-1-test-1771442522