Comments (7)
Indeed, as far as I can see, there is a priori nothing that should prevent marge-bot from running on CE. We are using EE ourselves and didn't have the chance so far of running it against CE, so thanks for reporting this!
We are hitting the /api/v4/projects/{id}/merge_requests/{id}/approvals
endpoint early on to find out if the merge request has pending approvals (so that we don't waste time rebasing a merge request that we cannot merge) and this is were you see the error. Here we should detect that we are on CE and instead of hitting the REST endpoint, produce a "no approvals needed" response directly. I should be able to push a fix for this tomorrow.
from marge-bot.
@jcpetruzza I think this is the way to go for now. We could also consider optionally overloading 👍 as approval for CE. I did even think about this before in the context of enterprise edition, because gitlab EE lacks some negative approval feature, as found e.g. in Phabricator (i.e. a reviewer can block even if the minimum number of approver is already met; that's potentially handy if someone spotted a problem that others have missed). So you could use 👎 for that.
from marge-bot.
@backfx I've pushed a fix for this on the PR above; is it possible for you to run marge-bot from that branch and see if you find other issues on CE? (I don't currently have a CE instance at hand to try it myself).
from marge-bot.
@jcpetruzza Yes I can test your changes on a ubuntu container inside my docker environment. Can u shortly explain the steps I have to do for building marge-bot?
from marge-bot.
Sure. The easiest thing would be to install nix inside your ubuntu container and use that to build a docker image. That way we ensure you don't run into troubles with the wrong version of python (we may be using 3.6 syntax somewhere and ubuntu), git, etc. You can later uninstall if you want it by removing the /nix
directory.
$ curl https://nixos.org/nix/install | sh # will create a /nix directory, and add a line to your `~/.profile`
$ . ~/.profile # so you get nix on your path, etc.
$ git clone [email protected]:smarkets/marge-bot.git
$ cd marge-bot
$ git checkout ce_compatibility
$ make dockerize # this will produce a `marge-bot` docker image
$ docker run marge-bot --gitlab-url=...
If you run into any issues, just let me know!
from marge-bot.
I successfully build your branch on top of nixos/nix. With your fix it already merged some merge-requests on CE. I'll do some more tests later. But for now its very promising. Would say that you can close this issue.
Thank you very much!
from marge-bot.
Cool! I've merged the fix and made a new release, so the CE-compatible version is already available on docker-hub. Thanks for your help!
from marge-bot.
Related Issues (20)
- Marge-bot logs "Someone skipped the queue! Will have to try again..." even though she merged an MR
- Guarantee final pipeline when assigned to marge-bot
- Bot cannot receive pipeline status with no-ff-merge HOT 10
- feature request: rebase without pushing
- Feature request: let marge bot leave a comment when she notices that an MR was assigned to her
- SSO User Support
- Bug: `--guarantee-final-pipeline` does not work with Gitlab CI
- "Branch cannot be merged" still happening HOT 1
- Source branches are not deleted when using batch mode HOT 4
- LetsEncrypt cert from the included CA Bundle is expired
- Marge Bot is logging PAT while fetching the repository
- Document group access tokens HOT 2
- Marge uses SSH even if I configure it to use HTTPS
- Marge ignores /etc/hosts
- Hard-to-interpret messages when discussions are unresolved
- Feature Request: Configure who to assign if merge doesn't work HOT 1
- Marge-bot container keeps restarting
- A holistic approach to versioning, CICD and audit reporting HOT 1
- Fix merging action when last source commit is not last target commit (gitlab_rebase) HOT 1
- Wait for CI to pass checks happen too fast for Jenkins plugin HOT 1
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from marge-bot.