Skip to content

Commit 1dd1c71

Browse files
committed
switch from hub to gh CLI
1 parent d429166 commit 1dd1c71

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

step.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ create_pr() {
3232
git checkout $branch_to_merge_from
3333

3434
#! Create pull request
35-
PULL_REQUEST=$(hub pull-request -b $branch_to_merge_into -m "merge $branch_to_merge_from in $branch_to_merge_into [${GIT_CLONE_COMMIT_MESSAGE_SUBJECT}] [skip ci]")
35+
36+
37+
PULL_REQUEST=$(gh pr create -B $branch_to_merge_into -t "merge $branch_to_merge_from in $branch_to_merge_into [${GIT_CLONE_COMMIT_MESSAGE_SUBJECT}] [skip ci]" -b "There was an error merging $branch_to_merge_from in $branch_to_merge_into [${GIT_CLONE_COMMIT_MESSAGE_SUBJECT}], please fix the conflict and merge manually. [skip ci]")
3638

3739
envman add --key CREATED_PULL_REQUEST --value "${PULL_REQUEST}"
3840
echo "Pull request created at ${PULL_REQUEST}"

step.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ deps:
5353
brew:
5454
- name: git
5555
- name: wget
56-
- name: hub
56+
- name: gh
5757
apt_get:
5858
- name: git
5959
- name: wget
@@ -81,7 +81,7 @@ inputs:
8181
a git branch name
8282
is_expand: true
8383
is_required: true
84-
84+
8585
outputs:
8686
- CREATED_PULL_REQUEST:
8787
opts:

0 commit comments

Comments
 (0)