diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-12-18 15:33:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-18 15:33:35 +0000 |
| commit | b53a08ee23c3f2c2af3456cd618fb43aec65f8b5 (patch) | |
| tree | c7aba79a04d53a51d58e4cb879c43318fc08531c | |
| parent | 0fd17fc4e574c1b245c95c2fb878785e94316591 (diff) | |
| parent | d0c344063a36e86e757136dd79b666ab29a8ba69 (diff) | |
| download | nix-b53a08ee23c3f2c2af3456cd618fb43aec65f8b5.zip | |
Merge #1365
1365: Fix duplicate entry in bors.toml r=asomers a=asomers
Also, sort the entries alphabetically, since that's how Github displays
them.
Co-authored-by: Alan Somers <asomers@gmail.com>
| -rw-r--r-- | bors.toml | 37 |
1 files changed, 18 insertions, 19 deletions
@@ -1,33 +1,32 @@ status = [ - "FreeBSD amd64 & i686", - "OSX x86_64", - "OSX i686", - "iOS", - "Linux aarch64", - "Linux arm gnueabi", - "Linux armv7 gnueabihf", - "Linux i686", - "Linux i686 musl", - "Linux MIPS", - "Linux MIPS64", - "Linux MIPS64 el", - "Linux mipsel", - "Linux powerpc64le", - "Rust Stable", - "Linux x86_64", - "Linux x86_64 musl", "Android aarch64", "Android arm", "Android armv7", "Android i686", "Android x86_64", + "FreeBSD amd64 & i686", + "Linux MIPS", + "Linux MIPS64 el", + "Linux MIPS64", + "Linux aarch64", + "Linux arm gnueabi", "Linux arm-musleabi", + "Linux armv7 gnueabihf", + "Linux i686 musl", + "Linux i686", + "Linux mipsel", "Linux powerpc", + "Linux powerpc64le", "Linux s390x", - "Linux s390x", + "Linux x86_64 musl", + "Linux x86_64", + "Minver", "NetBSD x86_64", + "OSX i686", + "OSX x86_64", "Redox x86_64", - "Minver", + "Rust Stable", + "iOS", ] # Set bors's timeout to 1 hour |