Skip to content

Commit 09545e5

Browse files
committed
github/actions: Change to manual merge for the man page converter
Merge cannot be done automatically due to the new review approval requirement on the main and stable branches. Add a random number to the temporary branch to avoid conflict among multiple action runs since now the temporary branches need to be deleted manually. Signed-off-by: Jianxin Xiong <[email protected]>
1 parent 3bb8ae6 commit 09545e5

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

.github/workflows/nroff-elves.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ done
5151
git config --global user.name "OFIWG Bot"
5252
git config --global user.email "[email protected]"
5353

54-
branch_name=pr/update-nroff-generated-man-pages-$BASE_REF
54+
branch_name=pr/update-nroff-generated-man-pages-$BASE_REF-`date +%s`
5555
git checkout -b $branch_name
5656

5757
set +e
@@ -70,6 +70,10 @@ git push --set-upstream origin $branch_name
7070
url=`gh pr create --base $BASE_REF --title 'Update nroff-generated man pages' --body ''`
7171
pr_num=`echo $url | cut -d/ -f7`
7272

73+
# skip the remaining steps for now since merge now requires
74+
# appproval which cannot be done automatically.
75+
exit 0
76+
7377
# Wait for the required "DCO" CI to complete
7478
i=0
7579
sleep_time=5

0 commit comments

Comments
 (0)