Add support for Gitea #124

MagicRB · 2024-04-22T14:00:22Z

This pull request is just there to publicize the code I'm working on, before being ready it'll get probably more cleaned up and merged with the Gitea backend pull request.

Mic92 · 2024-04-23T09:49:02Z

buildbot_nix/__init__.py

@@ -239,7 +262,9 @@ def __init__(self, **kwargs: Any) -> None:
    @defer.inlineCallbacks
    def run(self) -> Generator[Any, object, Any]:
        # run `nix build`
-        cmd: remotecommand.RemoteCommand = yield self.makeRemoteShellCommand()


What was the issue with the previous line?

All of your questions, types, typechecking seemed to be broken for me, soemhow through a yield it wouldnt type check, my guess is that a yield can return an error value. I wanted to remove all the type errors so its easier for me to write (and for the future). I can revert these bits no problem if so desired

What typechecker are you using? It works with mypy here.

I will try mypy then and clean up these workarounds 👍. Sorry for the mess

Alright. You can use nix fmt to get a local type check.

Mic92 · 2024-04-23T09:49:16Z

buildbot_nix/__init__.py

@@ -224,7 +245,9 @@ def run(self) -> Generator[Any, object, Any]:
        error = self.getProperty("error")
        attr = self.getProperty("attr")
        # show eval error
-        error_log: Log = yield self.addLog("nix_error")
+        # TODO why doesn't type information pass through yield again?
+        error_log_: object  = yield self.addLog("nix_error")


same question as above.

Mic92 · 2024-04-23T09:49:27Z

buildbot_nix/__init__.py

        self.observer = logobserver.BufferLogObserver()
        self.addLogObserver("stdio", self.observer)
        self.supported_systems = supported_systems

    @defer.inlineCallbacks
    def run(self) -> Generator[Any, object, Any]:
        # run nix-eval-jobs --flake .#checks to generate the dict of stages
-        cmd: remotecommand.RemoteCommand = yield self.makeRemoteShellCommand()


Same question as above.

Mic92 · 2024-04-23T09:51:25Z

buildbot_nix/__init__.py

-        self.stdio_log: Log = yield self.addLogForRemoteCommands("stdio")
-
+        # TODO why doesn't type information pass through yield again?
+        stdio_log_: object = yield self.addLogForRemoteCommands("stdio")


Same question as above.

Mic92 · 2024-04-23T14:10:36Z

@mergify rebase

mergify · 2024-04-23T14:11:15Z

rebase

✅ Branch has been successfully rebased

MagicRB · 2024-04-27T15:33:22Z

Ready for review! I verified all functionality to be working against a fork of this repository at https://github.com/magicrb/buildbot-nix and https://codeberg.org/magic_rb/buildbot-nix. No regressions have been introduced as far as I can tell. The following section includes notes that I took while working on this.

Initial Setup

confused about how the GH integration works. The docs aren't great.
https://github.com/settings/tokens/new took me ages to find
the gh app must be installed and oauth enabled
git is required
force eval manually is broken, properties do not get populated
will only consider PRs or default branch, no way to make it consider other branches

Removing GitHub Assumption

gonna end up using https://github.com/lab132/buildbot-gitea, thank god I don't have to implement this myself;
Types created by a function not allowed in type expression microsoft/pyright#6000 so therefore buildbot.plugins.util.BuilderConfig is invalid?
- from buildbot.config.builder import BuilderConfig works

Adding Gitea

Gitea's API is very similar to GitHub's, especially the responses. Only thing different so far is that Gitea doesn't include topics in the repo listing, but that is easy to splice in.
It is very unclear whether Gitea includes repos of orgs a user belongs to in the /api/v1/user/repos endpoint, if not it's easy to splice in again
what happens if the same project owner/repo is on Gitea and GitHub
the reporters are stupid, they will trigger all for every repo, i dont know how to make them not trigger for the incorrect one, maybe subclassing and a filter?s

Cleanup and Finalizing

still don't know how to resolve this

# TODO Gitea doesn't include this information
return False # self.data["owner"]["type"] == "Organization"

Gitea really doesn't seem to expose that information, the API docs agree.

Lastly:
mypy is a much weaker type checker in my experience, it would miss many cases of errors that pyright would report, but I did undo the weird type casting since we're using mypy.

mannp · 2024-04-27T16:24:14Z

Very happy for this, thank you. Out of interest, would this support private forgejo/gitea repos or public only?

MagicRB · 2024-04-27T17:19:18Z

Very happy for this, thank you. Out of interest, would this support private forgejo/gitea repos or public only?

If the buildbot instance can access the instance, https works, then it should be fine I think. It is untested though.

MagicRB · 2024-04-27T17:21:45Z

oh yeah, there are a few unresolved things:

reporters will trigger for both gitea and github, both of them. The gitea one will skip the report gracefully, the github one will throw an exception. But it seems to be harmless
The Gitea plugin doesnt support avatars
Gitea doesn't seem to distinguish between organizations and users in its API, so belongs_to_org is a noop and always returns False
buildbot doesn't support multiple authentication plugins at once, the default is github

Signed-off-by: magic_rb <richard@brezak.sk>

zowoq · 2024-06-14T08:55:30Z

buildbot_nix/github_projects.py

+    # TODO unused
+    buildbot_user: str


Does TODO unused mean buildbot_user can be removed?

At the time I wasn't a 100% sure, but now I am, and yes it can

Thanks, I'll send a PR.

#186

Mic92 reviewed Apr 23, 2024

View reviewed changes

Mic92 force-pushed the remove_github_assumption branch from dc99e6e to b608c2b Compare April 23, 2024 14:11

Mic92 mentioned this pull request Apr 23, 2024

Gitea support at all? #91

Closed

MagicRB force-pushed the remove_github_assumption branch from abcf8e9 to 67df676 Compare April 27, 2024 15:26

MagicRB marked this pull request as ready for review April 27, 2024 15:28

MagicRB changed the title ~~Remove assumption of GitHub being the only forge~~ Add support for Gitea Apr 27, 2024

MagicRB added 2 commits April 29, 2024 18:29

Remove assumption of GitHub being the only forge

1605d2d

Signed-off-by: magic_rb <richard@brezak.sk>

Add Gitea backend

3f01a96

Signed-off-by: magic_rb <richard@brezak.sk>

Mic92 force-pushed the remove_github_assumption branch from c61cc63 to 3f01a96 Compare April 29, 2024 16:30

Mic92 merged commit 508ceb8 into nix-community:main Apr 30, 2024
10 checks passed

zowoq reviewed Jun 14, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for Gitea #124

Add support for Gitea #124

MagicRB commented Apr 22, 2024

Mic92 Apr 23, 2024

MagicRB Apr 23, 2024

Mic92 Apr 23, 2024 •

edited

Loading

MagicRB Apr 23, 2024

MagicRB Apr 23, 2024

Mic92 Apr 23, 2024

Mic92 Apr 23, 2024

Mic92 Apr 23, 2024

Mic92 Apr 23, 2024

Mic92 commented Apr 23, 2024

mergify bot commented Apr 23, 2024

MagicRB commented Apr 27, 2024

mannp commented Apr 27, 2024

MagicRB commented Apr 27, 2024

MagicRB commented Apr 27, 2024

zowoq Jun 14, 2024

MagicRB Jun 14, 2024

zowoq Jun 14, 2024 •

edited

Loading

Add support for Gitea #124

Add support for Gitea #124

Conversation

MagicRB commented Apr 22, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Mic92 Apr 23, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Mic92 commented Apr 23, 2024

mergify bot commented Apr 23, 2024

✅ Branch has been successfully rebased

MagicRB commented Apr 27, 2024

Initial Setup

Removing GitHub Assumption

Adding Gitea

Cleanup and Finalizing

mannp commented Apr 27, 2024

MagicRB commented Apr 27, 2024

MagicRB commented Apr 27, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zowoq Jun 14, 2024 • edited Loading

Choose a reason for hiding this comment

Mic92 Apr 23, 2024 •

edited

Loading

zowoq Jun 14, 2024 •

edited

Loading