Skip to content

Commit

Permalink
github/actions: Change to manual merge for the man page converter
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
j-xiong committed Jan 31, 2025
1 parent 3bb8ae6 commit 09545e5
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion .github/workflows/nroff-elves.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ done
git config --global user.name "OFIWG Bot"
git config --global user.email "[email protected]"

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

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

# skip the remaining steps for now since merge now requires
# appproval which cannot be done automatically.
exit 0

# Wait for the required "DCO" CI to complete
i=0
sleep_time=5
Expand Down

0 comments on commit 09545e5

Please sign in to comment.