Skip to content

Commit 2575576

Browse files
committed
fixup! fixup! Rewrite RTD configuration to use build.jobs rather than build.commands
1 parent ee2c73f commit 2575576

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

.readthedocs.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@ build:
3030
if ! git merge-base HEAD origin/$base_branch;
3131
then
3232
git fetch --deepen=50 origin $base_branch;
33+
else
34+
break;
3335
fi;
3436
done;
35-
if ! git merge --no-edit origin/$base_branch;
37+
if ! git -c "user.name=rtd" -c "user.email=no-reply@readthedocs.org" merge --no-edit origin/$base_branch;
3638
then
3739
echo "Unsuccessful merge with '$base_branch' branch, skipping the build";
3840
exit 183;

0 commit comments

Comments
 (0)