Merge PR through github API

[tobiasdiez]

Currently,

sage-release-management/git_sage/repo/release_merge.py

Lines 78 to 90 in a246c86

	log.info(f'Merging {self.pr}')
	branch_tip = self.branch_tip.oid
	self.repo.merge(branch_tip)
	user = self.repo.default_signature
	tree = self.repo.index.write_tree()
	message = self.message
	merge_commit = self.repo.create_commit(
	'HEAD', user, user, message, tree,
	[self.repo.head.target, branch_tip])
	if self.repo.index.conflicts:
	raise MergeConflictException(self.pr.number)
	self.repo.state_cleanup()
	return merge_commit

only creates a commit but not (directly) merges the PR. Here is the API for it: https://docs.github.com/en/rest/pulls/pulls?apiVersion=2022-11-28#merge-a-pull-request

[vbraun]

Yes because I currently run the buildbot with the merge commit and only push it to develop if the checks pass. A bit like a merge queue.

[tobiasdiez]

At sagemath/sage#35062, I'm proposing to activate github's new merge queue feature. What would be needed to make this equivalent to your current setup using the buildbot?

[vbraun]

I haven't used it but the real task is to set up CI that adequately covers the supported platforms, not turning on the merge queue feature.

[mkoeppe]

What platforms do you test, Volker?

[vbraun]

I'm apparently building some platform-independent parts that aren't covered by the current ci, e.g. pdf docs

The builders are here: http://build.sagemath.org/#/builders

[mkoeppe]

On that page, where does one see what system packages are installed, and how you configure the build?

[mkoeppe]

Yes, we should add a PDF doc builder to the CI that runs for every ticket.

[vbraun]

The buildbot workers are all minimal installations, the worker configuration is in https://github.com/sagemath/buildbot-sage/blob/master/sage_bot/workers.py

[mkoeppe]

Thanks, I'll take a look.

By the way, a PDF builder is added in sagemath/sage#35169