Skip to content

Commit

Permalink
development branch -> develop
Browse files Browse the repository at this point in the history
  • Loading branch information
kfischer-okarin authored and Redmine Patch Meetup committed Dec 19, 2020
1 parent 701da01 commit 3ef3f21
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/comment-patch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- completed
branches-ignore:
- master
- development
- develop

jobs:
create-patch:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/create-patch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches-ignore:
- master
- development
- develop

jobs:
create-patch:
Expand All @@ -16,14 +16,14 @@ jobs:
- name: Create Patch
run: |
git rev-parse --abbrev-ref HEAD > .branch-name
git checkout development
git checkout develop
git checkout -b patch
git merge --squash `cat .branch-name`
git config --global user.email "$AUTHOR_EMAIL"
git config --global user.name "$AUTHOR_NAME"
git commit -m "Patch for `cat .branch-name`"
PATCH_FILE=`cat .branch-name | sed 's/\//_/g'`.patch # Replace forward slash in branch name with _
git format-patch development..HEAD --stdout -k > $PATCH_FILE
git format-patch develop..HEAD --stdout -k > $PATCH_FILE
echo "::set-output name=PATCH_FILE::$PATCH_FILE"
id: patch-creator
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches-ignore:
- master
- development
- develop

jobs:
test-with-mysql:
Expand Down

0 comments on commit 3ef3f21

Please sign in to comment.