diff options
| author | Valery Piashchynski <[email protected]> | 2020-12-08 18:31:30 +0300 |
|---|---|---|
| committer | Valery Piashchynski <[email protected]> | 2020-12-08 18:31:30 +0300 |
| commit | df31ff9cb4cc4bd696a63163c8b4c2661fc28a8d (patch) | |
| tree | ccdb5d1596938f23a36f7aa880a348f2ab3cbba8 /bors.toml | |
| parent | 196d97e697680340d2c535f6a782ac38216b320a (diff) | |
| parent | 95bcb4c3f390bebb91041db710dbb4bde994d2fe (diff) | |
Merge remote-tracking branch 'origin/master' into 2.0
# Conflicts:
# .github/workflows/ci-build.yml
# .gitignore
# Dockerfile
# Makefile
# bin/rr
# bors.toml
# cmd/rr/cmd/root.go
Diffstat (limited to 'bors.toml')
| -rwxr-xr-x | bors.toml | 21 |
1 files changed, 14 insertions, 7 deletions
@@ -1,11 +1,18 @@ status = [ - 'Build (PHP 7.4, Go 1.15, OS ubuntu-latest)', - 'Build (PHP 7.4, Go 1.14, OS ubuntu-latest)', - 'Build (PHP 8, Go 1.15, OS ubuntu-latest)', - 'Build (PHP 8, Go 1.14, OS ubuntu-latest)', - 'runner / golangci-lint', ] - +'Build (PHP 7.3, basic setup)', +'Build (PHP 7.3, lowest setup)', +'Build (PHP 8.0, basic setup)', +'Build (PHP 8.0, lowest setup)', +'Build (Go 1.14, PHP 7.3)', +'Build (Go 1.15, PHP 7.3)', +'Build (Go 1.14, PHP 7.4)', +'Build (Go 1.15, PHP 7.4)', +'Build (Go 1.14, PHP 8.0)', +'Build (Go 1.15, PHP 8.0)', +'Golang-CI (lint)', +'Build docker image', +] required_approvals = 1 delete_merged_branches = true -timeout-sec = 600
\ No newline at end of file +timeout-sec = 1800 |