Skip to content

Commit

Permalink
ci: remove bors mention
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
dkm authored and tschwinge committed Nov 23, 2024
1 parent eb1c8e4 commit fa54737
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 19 deletions.
8 changes: 0 additions & 8 deletions .github/bors.toml

This file was deleted.

File renamed without changes.
14 changes: 7 additions & 7 deletions .github/workflows/ccpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
build-and-check-ubuntu-64bit:

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

runs-on: ubuntu-22.04
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
run: |
cd gccrs-build
< log grep 'warning: ' | sort > log_warnings
if diff -U0 ../.github/bors_log_expected_warnings log_warnings; then
if diff -U0 ../.github/log_expected_warnings log_warnings; then
:
else
echo 'See <https://github.com/Rust-GCC/gccrs/pull/1026>.'
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
build-and-check-ubuntu-64bit-glibcxx:

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

runs-on: ubuntu-22.04
Expand Down Expand Up @@ -185,7 +185,7 @@ jobs:
build-and-check-ubuntu-32bit:

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

runs-on: ubuntu-22.04
Expand Down Expand Up @@ -237,7 +237,7 @@ jobs:
run: |
cd gccrs-build
< log grep 'warning: ' | sort > log_warnings
if diff -U0 ../.github/bors_log_expected_warnings log_warnings; then
if diff -U0 ../.github/log_expected_warnings log_warnings; then
:
else
echo 'See <https://github.com/Rust-GCC/gccrs/pull/1026>.'
Expand Down Expand Up @@ -405,7 +405,7 @@ jobs:
build-and-check-asan:

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

runs-on: ubuntu-22.04
Expand Down Expand Up @@ -459,7 +459,7 @@ jobs:
# run: |
# cd gccrs-build
# < log grep 'warning: ' | sort > log_warnings
# if diff -U0 ../.github/bors_log_expected_warnings log_warnings; then
# if diff -U0 ../.github/log_expected_warnings log_warnings; then
# :
# else
# echo 'See <https://github.com/Rust-GCC/gccrs/pull/1026>.'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ccpp32alpine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
build-alpine-32bit-and-check-alpine-32bit:

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

runs-on: ubuntu-22.04
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ and the link to the GitHub PR sent to the submitter.
* The PR policy: Everything has to go through a PR
- An exception to this rule will be the merge commits of updating the repo against upstream GCC

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

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

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

0 comments on commit fa54737

Please sign in to comment.