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 <dkm@kataplop.net>

diff --git a/.github/bors.toml b/.github/bors.toml
deleted file mode 100644 (file)
index 732ef5c..0000000
--- a/.github/bors.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-status = [
-  "build-and-check-ubuntu-64bit",
-  "build-and-check-ubuntu-32bit",
-  "build-and-check-gcc-48",
-]
-# Uncomment this to use a two hour timeout.
-# The default is one hour.
-#timeout_sec = 7200

diff --git a/.github/bors_log_expected_warnings b/.github/log_expected_warnings
similarity index 100%
rename from .github/bors_log_expected_warnings
rename to .github/log_expected_warnings

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 5485763c056045e2f72e1028240f382abf988c10..841dde2e7c10d47ed6ae003fa30ac9454dc13dbf 100644 (file)
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -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
@@ -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>.'
@@ -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
@@ -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
@@ -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>.'
@@ -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
@@ -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>.'

diff --git a/.github/workflows/ccpp32alpine.yml b/.github/workflows/ccpp32alpine.yml
index 82901ea3c146b7e7d4802e2b02a228920e0fe203..cae7133766dcb37c40ffac203018328fb4da769b 100644 (file)
--- a/.github/workflows/ccpp32alpine.yml
+++ b/.github/workflows/ccpp32alpine.yml
@@ -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

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 98cd8894ad682dd3a7e8b55c9e5206e4db8a5268..26f5618d779edb64ee6858decabc3c25dcb72dcb 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -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)
 

diff --git a/README.md b/README.md
index bd79c4a713c13b6c841a32e13ffc577bf5e64099..afe2a9e6464e128af7b50ad06a5e240e80dba6d7 100644 (file)
--- a/README.md
+++ b/README.md
@@ -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")
@@ -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.