File tree Expand file tree Collapse file tree 1 file changed +7
-4
lines changed Expand file tree Collapse file tree 1 file changed +7
-4
lines changed Original file line number Diff line number Diff line change 21
21
with :
22
22
fetch-depth : 0
23
23
token : " ${{ secrets.RENKUBOT_GITHUB_TOKEN }}"
24
+ ref : ${{ inputs.branch_name }}
24
25
- name : Set up Python
25
26
uses : actions/setup-python@v4
26
27
with :
@@ -39,10 +40,11 @@ jobs:
39
40
git config --global --add user.email "[email protected] "
40
41
- name : Setup local branch and merge tool
41
42
run : |
42
- git branch --track "${{ inputs.branch_name }}" "origin/${{ inputs.branch_name }}" || git checkout "${{ inputs.branch_name }}"
43
+ git branch --track "${{ inputs.branch_name }}" "origin/${{ inputs.branch_name }}" || ( git checkout "${{ inputs.branch_name }}" && git branch -u "origin/${{ inputs.branch_name }}" )
44
+ git pull
43
45
echo "poetry.lock merge=ours" >> .git/info/attributes
44
46
git config merge.ours.driver true
45
- git merge --no-edit develop
47
+ git merge --no-edit "origin/${{ inputs.target_branch }}"
46
48
- name : Merge PRs
47
49
id : merge_prs
48
50
env :
75
77
poetry lock
76
78
git add -A
77
79
git commit -m "update lock file" --no-verify
78
- git push origin "${{ inputs.branch_name }}"
80
+ git status
81
+ git push
79
82
echo "pr_body=$pr_body" >> $GITHUB_OUTPUT
80
83
- name : Create Pull Request
81
84
uses : actions/github-script@v6
88
91
owner,
89
92
repo,
90
93
head: '${{ inputs.branch_name }}',
91
- base: '${{ github.event. inputs.target_branch }}',
94
+ base: '${{ inputs.target_branch }}',
92
95
body: '${{ steps.merge_prs.outputs.pr_body }}'
93
96
});
94
97
github.rest.issues.addLabels({
You can’t perform that action at this time.
0 commit comments