Skip to content

Commit f548ec5

Browse files
authored
Switch to Github merge queue (#476)
* Switch to Github merge queue * Fix nightly action * Fix format
1 parent 64089cf commit f548ec5

File tree

7 files changed

+26
-60
lines changed

7 files changed

+26
-60
lines changed

.github/workflows/CI.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,12 @@ name: CI
33
on:
44
push:
55
branches:
6-
# This is where pull requests from "bors r+" are built.
7-
- staging
8-
# This is where pull requests from "bors try" are built.
9-
- trying
10-
# Build the master branch.
116
- master
127
pull_request:
138
branches:
149
- master
10+
merge_group:
11+
types: [checks_requested]
1512

1613
jobs:
1714
test:

.github/workflows/Docs.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ name: Documentation
33
on:
44
push:
55
branches:
6-
# This is where pull requests from "bors r+" are built.
7-
- staging
8-
# This is where pull requests from "bors try" are built.
9-
- trying
10-
# Build the master branch.
116
- master
127
tags: '*'
138
pull_request:
9+
branches:
10+
- master
11+
merge_group:
12+
types: [checks_requested]
1413

1514
concurrency:
1615
# Skip intermediate builds: always.

.github/workflows/Format.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ name: Format
33
on:
44
push:
55
branches:
6-
# This is where pull requests from "bors r+" are built.
7-
- staging
8-
# This is where pull requests from "bors try" are built.
9-
- trying
10-
# Build the master branch.
116
- master
127
pull_request:
8+
branches:
9+
- master
10+
merge_group:
11+
types: [checks_requested]
1312

1413
concurrency:
1514
# Skip intermediate builds: always.

.github/workflows/IntegrationTest.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@ name: IntegrationTest
33
on:
44
push:
55
branches:
6-
# This is where pull requests from "bors r+" are built.
7-
- staging
8-
# This is where pull requests from "bors try" are built.
9-
- trying
10-
# Build the master branch.
116
- master
7+
merge_group:
8+
types: [checks_requested]
129

1310
jobs:
1411
test:

.github/workflows/JuliaNightly.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ name: JuliaNightly
33
on:
44
push:
55
branches:
6-
# This is where pull requests from "bors r+" are built.
7-
- staging
8-
# This is where pull requests from "bors try" are built.
9-
- trying
10-
# Build the master branch.
6+
- master
7+
pull_request:
8+
branches:
119
- master
1210

1311
jobs:

README.md

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
[![Codecov](https://codecov.io/gh/TuringLang/DynamicPPL.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/TuringLang/DynamicPPL.jl)
1010
[![Code Style: Blue](https://img.shields.io/badge/code%20style-blue-4495d1.svg)](https://github.com/invenia/BlueStyle)
1111
[![ColPrac: Contributor's Guide on Collaborative Practices for Community Packages](https://img.shields.io/badge/ColPrac-Contributor%27s%20Guide-blueviolet)](https://colprac.sciml.ai/)
12-
[![Bors enabled](https://bors.tech/images/badge_small.svg)](https://app.bors.tech/repositories/24589)
1312

1413
*A domain-specific language and backend for probabilistic programming, used by [Turing.jl](https://github.com/TuringLang/Turing.jl).*
1514

@@ -29,24 +28,21 @@ If you feel you have some relevant skills and are interested in contributing, pl
2928

3029
### Contributor's Guide
3130

32-
This project follows the [![ColPrac: Contributor's Guide on Collaborative Practices for Community Packages](https://img.shields.io/badge/ColPrac-Contributor's%20Guide-blueviolet)](https://colprac.sciml.ai/), apart from the following slight variation:
31+
This project follows the [![ColPrac: Contributor's Guide on Collaborative Practices for Community Packages](https://img.shields.io/badge/ColPrac-Contributor%27s%20Guide-blueviolet)](https://colprac.sciml.ai/), apart from the following slight variation:
3332

34-
- The master branch contains the most recent release at any point in time. All non-breaking changes (bug fixes etc.) are merged directly into master and a new patch version is released immediately.
35-
- A separate dev branch contains all breaking changes, and is merged into master when a minor version release happens.
33+
- The master branch contains the most recent release at any point in time. All non-breaking changes (bug fixes etc.) are merged directly into master and a new patch version is released immediately.
34+
- A separate dev branch contains all breaking changes, and is merged into master when a minor version release happens.
3635

3736
For instance, suppose we are currently on version 0.13.5.
3837

39-
- If someone produces a bug fix, it is merged directly into master and bumps the version to 0.13.6. This change is also merged into dev so that it remains up-to-date with master.
40-
- If someone is working on a new feature that is not breaking (performance-related, fancy new syntax that is backwards-compatible etc.), the same happens.
41-
- New breaking changes are merged into dev until a release is ready to go, at which point dev is merged into master and version 0.14 is released.
38+
- If someone produces a bug fix, it is merged directly into master and bumps the version to 0.13.6. This change is also merged into dev so that it remains up-to-date with master.
39+
- If someone is working on a new feature that is not breaking (performance-related, fancy new syntax that is backwards-compatible etc.), the same happens.
40+
- New breaking changes are merged into dev until a release is ready to go, at which point dev is merged into master and version 0.14 is released.
4241

43-
### Bors
42+
### Merge Queue
4443

45-
This project uses [Bors](https://bors.tech/) for merging PRs. Bors is a Github bot that prevents merge skew / semantic merge conflicts by testing
46-
the exact integration of pull requests before merging them.
44+
This project uses a [merge queue](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue) for merging PRs.
45+
In this way, merge skew / semantic merge conflicts are prevented by testing the exact integration of pull requests before merging them.
4746

48-
When a PR is good enough for merging and has been approved by at least one reviewer, instead of merging immediately, it is added to the merge queue
49-
by commenting with `bors r+`. The Bors bot merges the pull request into a staging area, and runs the CI tests. If tests pass, the commit in the staging
50-
area is copied to the target branch (i.e., usually master).
51-
52-
PRs can be tested by adding a comment with `bors try`. Additional commands can be found in the [Bors documentation](https://bors.tech/documentation/).
47+
When a PR is good enough for merging and has been approved by at least one reviewer, instead of merging immediately, it is added to the merge queue.
48+
If the CI tests pass, including downstream tests of Turing, the PR is merged into the main branch.

bors.toml

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)