Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
queue_rules:
- name: default
conditions:
# Conditions to get out of the queue (= merged)
- check-success=lint
- check-success=test

pull_request_rules:
- name: Automatic merge on approval
conditions:
queue_conditions:
- base=master
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- check-success=lint
- check-success=test
- label!=do-not-merge
- label=ready-to-merge
merge_conditions:
# Conditions to get out of the queue (= merged)
- check-success=lint
- check-success=test
commit_message_template: |
{{ title }} (#{{ number }})
merge_method: merge

pull_request_rules:
- name: Automatic merge on approval
conditions: []
actions:
queue:
method: merge
name: default
commit_message_template: |
{{ title }} (#{{ number }})

14 changes: 7 additions & 7 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ linters-settings:
# TODO: enable and fix struct alignments
#enable:
# - fieldalignment
check-shadowing: true
settings:
printf:
funcs:
Expand Down Expand Up @@ -62,11 +61,12 @@ linters:
# additional linters
- bodyclose
- gocritic
- goerr113
- err113
- goimports
- gomnd
- mnd
- misspell
- noctx
- predeclared
- stylecheck
- whitespace
- wsl
Expand All @@ -76,13 +76,13 @@ linters:
run:
build-tags:
- gingonic
skip-dirs:
- scripts
- docker
- samples
#modules-download-mode: vendor

issues:
exclude-dirs:
- scripts
- docker
- samples
exclude-rules:
- linters:
- gosec
Expand Down
Loading