Skip to content

Commit

Permalink
ci: update mergify, ci config
Browse files Browse the repository at this point in the history
  • Loading branch information
joelrebel committed Jul 26, 2022
1 parent 1627e50 commit 4537d2d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
9 changes: 4 additions & 5 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
queue_rules:
queue_rule:
- name: default
conditions:
# Conditions to get out of the queue (= merged)
Expand All @@ -8,11 +8,11 @@ queue_rules:
pull_request_rules:
- name: Automatic merge on approval
conditions:
- base=master
- base=v2
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- check-success=lint
- check-success=test
- check-success='lint'
- check-success='test'
- label!=do-not-merge
- label=ready-to-merge
actions:
Expand All @@ -21,4 +21,3 @@ pull_request_rules:
name: default
commit_message_template: |
{{ title }} (#{{ number }})
2 changes: 0 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
with:
args: -v --config .golangci.yml --timeout=5m
version: latest
- name: goimports-check
run: go get golang.org/x/tools/cmd/goimports && make goimports-check
- name: make all-checks
run: make all-checks
test:
Expand Down

0 comments on commit 4537d2d

Please sign in to comment.