Skip to content

Commit 7e05469

Browse files
JellbyJellby
committed
Merge branch 'master' into external-MR
2 parents 67d06e1 + b1c9e0a commit 7e05469

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+2181
-602
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ ENV/
33
.cache
44
*.egg-info
55
.coverage
6+
.pytest_cache
67

78
# nix stuff
89
result
10+
result-*

‎.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ services:
44
language: nix
55
deploy:
66
provider: script
7-
script: make dockerize && make docker-push
7+
script: make dockerize && make docker-push VERSION="$TRAVIS_BRANCH"
88
on:
99
repo: smarkets/marge-bot
10-
tags: true
11-
condition: "$TRAVIS_TAG = $(cat version)"
10+
all_branches: true
11+
condition: "$TRAVIS_BRANCH = $(cat version) || $TRAVIS_BRANCH = master"
1212
env:
1313
global:
1414
# smarkets ci docker username

‎CHANGELOG.md

+30
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,33 @@
1+
* 0.9.1:
2+
- Feature: support passing a timezone with the embargo #228
3+
- Fix: fix not checking the target project for MRs from forked projects #218
4+
* 0.9.0:
5+
- Feature: support rebasing through GitLab's API #160
6+
- Feature: allow restrict source branches #206
7+
- Fix: only fetch projects with min access level #166
8+
- Fix: bump all dependencies (getting rid of vulnerable packages) #179
9+
- Fix: support multiple assignees #186, #192
10+
- Fix: fetch pipelines by merge request instead of branch #212
11+
- Fix: fix unassign when author is Marge #211
12+
- Enhancement: ignore archived projects #177
13+
- Enhancement: add a timeout to all gitlab requests #200
14+
- Enhancement: smaller docker image size #199
15+
* 0.8.1
16+
- Feature: allow merging in order of last-update time #149
17+
* 0.8.0
18+
- Feature: allow reference repository in git clone #129
19+
- Feature: add new stable/master tags for docker images #142
20+
- Fix: fix TypeError when fetching source project #122
21+
- Fix: handle CI status 'skipped' #127
22+
- Fix: handle merging when source branch is master #127
23+
- Fix: handle error on pushing to protected branches #127
24+
- Enhancement: add appropriate error if unresolved discussions on merge request #136
25+
- Enhancement: ensure reviewer and commit author aren't the same #137
26+
* 0.7.0:
27+
- Feature: add `--batch` to better support repos with many daily MRs and slow-ish CI (#84, #116)
28+
- Fix: fix fuse() call when using experimental --use-merge-strategy to update source branch #102
29+
- Fix: Get latest CI status of a commit filtered by branch #96 (thanks to benjamb)
30+
- Enhancement: Check MR is mergeable before accepting MR #117
131
* 0.6.1:
232
- Fix when target SHA is retrieved #92.
333
- Replace word "gitlab" with "GitLab" #93.

‎Makefile

+32-16
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,50 @@
1-
requirements_frozen.txt requirements.nix requirements_override.nix: requirements.txt
2-
pypi2nix -V 3.6 -r $^
1+
VERSION?=$$(git rev-parse --abbrev-ref HEAD)
32

43
.PHONY: all
5-
all: requirements_frozen.txt requirements.nix requirements_override.nix default.nix
6-
nix-build -K .
4+
all: requirements_frozen.txt requirements.nix requirements_override.nix marge-bot dockerize
5+
6+
.PHONY: marge-bot
7+
marge-bot:
8+
nix-build --keep-failed --attr marge-bot default.nix
79

810
.PHONY: clean
911
clean:
10-
rm -rf .cache result requirements_frozen.txt
12+
rm -rf .cache result result-* requirements_frozen.txt
13+
14+
.PHONY: bump
15+
bump: bump-requirements bump-sources
16+
17+
.PHONY: bump-sources
18+
bump-sources:
19+
nix-shell --run niv update
1120

1221
.PHONY: bump-requirements
1322
bump-requirements: clean requirements_frozen.txt
1423

15-
.PHONY: dockerize
16-
dockerize: dockerize.nix
17-
docker load --input $$(nix-build dockerize.nix)
24+
requirements_frozen.txt requirements.nix requirements_override.nix: requirements.txt
25+
pypi2nix -V 3.6 -r $^
1826

27+
.PHONY: dockerize
28+
dockerize:
29+
docker load --input $$(nix-build --attr docker-image default.nix)
1930

2031
.PHONY: docker-push
2132
docker-push:
2233
if [ -n "$$DOCKER_USERNAME" -a -n "$$DOCKER_PASSWORD" ]; then \
23-
docker login -u "$${DOCKER_USERNAME}" -p "$${DOCKER_PASSWORD}"; \
34+
docker login -u "$${DOCKER_USERNAME}" -p "$${DOCKER_PASSWORD}"; \
2435
else \
25-
docker login; \
36+
docker login; \
37+
fi
38+
docker tag smarkets/marge-bot:$$(cat version) smarkets/marge-bot:$(VERSION)
39+
if [ "$(VERSION)" = "$$(cat version)" ]; then \
40+
docker tag smarkets/marge-bot:$$(cat version) smarkets/marge-bot:latest; \
41+
docker tag smarkets/marge-bot:$$(cat version) smarkets/marge-bot:stable; \
42+
docker push smarkets/marge-bot:stable; \
43+
docker push smarkets/marge-bot:latest; \
2644
fi
27-
docker tag smarkets/marge-bot:$$(cat version) smarkets/marge-bot:latest
28-
docker push smarkets/marge-bot:$$(cat version)
29-
docker push smarkets/marge-bot:latest
45+
docker push smarkets/marge-bot:$(VERSION)
3046
# for backwards compatibility push to previous location
31-
docker tag smarkets/marge-bot:latest smarketshq/marge-bot:latest
32-
docker tag smarkets/marge-bot:latest smarketshq/marge-bot:$$(cat version)
33-
docker push smarketshq/marge-bot:$$(cat version)
47+
docker tag smarkets/marge-bot:$$(cat version) smarketshq/marge-bot:latest
48+
docker tag smarkets/marge-bot:$$(cat version) smarketshq/marge-bot:$(VERSION)
49+
docker push smarketshq/marge-bot:$(VERSION)
3450
docker push smarketshq/marge-bot:latest

0 commit comments

Comments
 (0)