Skip to content

Commit cecfc99

Browse files
committed
Change CI configuration (#145)
The changes in this PR try to enforce the use of bors to a larger extent. PRs are not tested automatically anymore but instead only when one comments with `bors try` (does not merge afterwards) or `bors r+` (merges automatically afterwards). Additionally, the configuration requires at least one approval of a project member and squashes commits before merging. I'm not sure about building the master branch as well - in my experience it leads to redundant tests (since the commits are tested in the staging branch already) but works a bit better with the display of the Github check status and the badges.
1 parent c85e73a commit cecfc99

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

.github/workflows/DynamicPPL-CI.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@ name: DynamicPPL-CI
33
on:
44
push:
55
branches:
6-
- master
7-
- dev
86
# This is where pull requests from "bors r+" are built.
97
- staging
108
# This is where pull requests from "bors try" are built.
119
- trying
12-
# Enable building pull requests.
13-
pull_request:
10+
# Build the master branch.
11+
- master
1412

1513
jobs:
1614
test:

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22
language: julia
33
branches:
44
only:
5-
# Enable building pull requests to master and dev.
6-
- master
7-
- dev
85
# This is where pull requests from "bors r+" are built.
96
- staging
107
# This is where pull requests from "bors try" are built.
118
- trying
9+
# Build the master branch.
10+
- master
1211
os:
1312
- linux
1413
- osx
@@ -32,4 +31,5 @@ notifications:
3231
after_success:
3332
- if [[ $TRAVIS_JULIA_VERSION = 1 ]] && [[ $JULIA_NUM_THREADS = 1 ]] && [[ $TRAVIS_OS_NAME = linux ]]; then
3433
julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())';
34+
julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder())';
3535
fi

bors.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ status = [
1212
"test (1, windows-latest, x64)"
1313
]
1414
delete_merged_branches = true
15-
# Uncomment this to require at least on approval of a project member.
16-
#required_approvals = 1
15+
# Require at least on approval of a project member.
16+
required_approvals = 1
17+
# Squash commits before merging.
18+
use_squash_merge = true
1719
# Uncomment this to use a two hour timeout.
1820
# The default is one hour.
1921
#timeout_sec = 7200

0 commit comments

Comments
 (0)