Skip to content

Commit d36292e

Browse files
committed
ci: remove bors mention
We are using github merge queues for some time now, instead of bors. Remove unmaintained files, and remove bors mentions. ChangeLog: * .github/bors_log_expected_warnings: Move to... * .github/log_expected_warnings: ...here. * .github/workflows/ccpp.yml: * .github/workflows/ccpp32alpine.yml: * CONTRIBUTING.md: * README.md: * .github/bors.toml: Removed. Signed-off-by: Marc Poulhiès <[email protected]>
1 parent eb1c8e4 commit d36292e

File tree

6 files changed

+10
-19
lines changed

6 files changed

+10
-19
lines changed

.github/bors.toml

-8
This file was deleted.
File renamed without changes.

.github/workflows/ccpp.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
build-and-check-ubuntu-64bit:
1717

1818
env:
19-
# Force locale, in particular for reproducible results re '.github/bors_log_expected_warnings' (see below).
19+
# Force locale, in particular for reproducible results re '.github/log_expected_warnings' (see below).
2020
LC_ALL: C.UTF-8
2121

2222
runs-on: ubuntu-22.04
@@ -68,7 +68,7 @@ jobs:
6868
run: |
6969
cd gccrs-build
7070
< log grep 'warning: ' | sort > log_warnings
71-
if diff -U0 ../.github/bors_log_expected_warnings log_warnings; then
71+
if diff -U0 ../.github/log_expected_warnings log_warnings; then
7272
:
7373
else
7474
echo 'See <https://github.com/Rust-GCC/gccrs/pull/1026>.'
@@ -100,7 +100,7 @@ jobs:
100100
build-and-check-ubuntu-64bit-glibcxx:
101101

102102
env:
103-
# Force locale, in particular for reproducible results re '.github/bors_log_expected_warnings' (see below).
103+
# Force locale, in particular for reproducible results re '.github/log_expected_warnings' (see below).
104104
LC_ALL: C.UTF-8
105105

106106
runs-on: ubuntu-22.04
@@ -185,7 +185,7 @@ jobs:
185185
build-and-check-ubuntu-32bit:
186186

187187
env:
188-
# Force locale, in particular for reproducible results re '.github/bors_log_expected_warnings' (see below).
188+
# Force locale, in particular for reproducible results re '.github/log_expected_warnings' (see below).
189189
LC_ALL: C.UTF-8
190190

191191
runs-on: ubuntu-22.04
@@ -237,7 +237,7 @@ jobs:
237237
run: |
238238
cd gccrs-build
239239
< log grep 'warning: ' | sort > log_warnings
240-
if diff -U0 ../.github/bors_log_expected_warnings log_warnings; then
240+
if diff -U0 ../.github/log_expected_warnings log_warnings; then
241241
:
242242
else
243243
echo 'See <https://github.com/Rust-GCC/gccrs/pull/1026>.'
@@ -405,7 +405,7 @@ jobs:
405405
build-and-check-asan:
406406

407407
env:
408-
# Force locale, in particular for reproducible results re '.github/bors_log_expected_warnings' (see below).
408+
# Force locale, in particular for reproducible results re '.github/log_expected_warnings' (see below).
409409
LC_ALL: C.UTF-8
410410

411411
runs-on: ubuntu-22.04
@@ -459,7 +459,7 @@ jobs:
459459
# run: |
460460
# cd gccrs-build
461461
# < log grep 'warning: ' | sort > log_warnings
462-
# if diff -U0 ../.github/bors_log_expected_warnings log_warnings; then
462+
# if diff -U0 ../.github/log_expected_warnings log_warnings; then
463463
# :
464464
# else
465465
# echo 'See <https://github.com/Rust-GCC/gccrs/pull/1026>.'

.github/workflows/ccpp32alpine.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
build-alpine-32bit-and-check-alpine-32bit:
1717

1818
env:
19-
# Force locale, in particular for reproducible results re '.github/bors_log_expected_warnings' (see below).
19+
# Force locale, in particular for reproducible results re '.github/log_expected_warnings' (see below).
2020
LC_ALL: C.UTF-8
2121

2222
runs-on: ubuntu-22.04

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ and the link to the GitHub PR sent to the submitter.
3939
* The PR policy: Everything has to go through a PR
4040
- An exception to this rule will be the merge commits of updating the repo against upstream GCC
4141

42-
* Reviewers/Maintainers of the project (aka people who have bors rights) should be pinged for reviews/questions.
42+
* Reviewers/Maintainers of the project should be pinged for reviews/questions.
4343

4444
* A PR can have one or several commits (split should have a technical/logical reason, ie. no fixup-ish commit)
4545

README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
[![Build Docker image](https://github.com/Rust-GCC/gccrs/actions/workflows/docker.yml/badge.svg)](https://github.com/Rust-GCC/gccrs/actions/workflows/docker.yml)
44
![Docker Pulls](https://img.shields.io/docker/pulls/philberty/gccrs)
55
[![project chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://gcc-rust.zulipchat.com/)
6-
[![Bors enabled](https://bors.tech/images/badge_small.svg)](https://app.bors.tech/repositories/32890)
76
[![justforfunnoreally.dev badge](https://img.shields.io/badge/justforfunnoreally-dev-9ff)](https://justforfunnoreally.dev)
87
# GCC Rust
98
![GCC Rust](logo.png?raw=true "GCC rust Logo")
@@ -255,7 +254,7 @@ With that, we're missing out on the aspect that _enforces that GCC compiles with
255254
To encounter that, the default CI has a [_check for new warnings_ step](https://github.com/Rust-GCC/gccrs/pull/1026)
256255
that verifies in the CI `--disable-bootstrap` build configuration that no new warnings are introduced.
257256
If that step fails, it usually points out a new _warning_ you've introduced erroneously, and should address.
258-
Occasionally it means that simply the `.github/bors_log_expected_warnings` file needs to be updated,
257+
Occasionally it means that simply the `.github/log_expected_warnings` file needs to be updated,
259258
for example if due to any kind of "environmental changes" (for example, CI "initial" compiler changes).
260259
Unless diligently reproducing the CI configuration (in particular "initial" compiler, GCC version),
261260
it's not really feasible to reproduce this check locally.

0 commit comments

Comments
 (0)