aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Poulhiès <dkm@kataplop.net>2024-11-23 11:59:46 +0100
committerThomas Schwinge <thomas@codesourcery.com>2024-11-23 17:08:04 +0000
commitfa547376d462f8e6ef9082e759266e04703d8c98 (patch)
tree280003ec59f44ce2b47138c34bf1a19280480bbe
parenteb1c8e462d4703cd938282aa23db35ddb2faa82b (diff)
downloadgcc-fa547376d462f8e6ef9082e759266e04703d8c98.zip
gcc-fa547376d462f8e6ef9082e759266e04703d8c98.tar.gz
gcc-fa547376d462f8e6ef9082e759266e04703d8c98.tar.bz2
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>
-rw-r--r--.github/bors.toml8
-rw-r--r--.github/log_expected_warnings (renamed from .github/bors_log_expected_warnings)0
-rw-r--r--.github/workflows/ccpp.yml14
-rw-r--r--.github/workflows/ccpp32alpine.yml2
-rw-r--r--CONTRIBUTING.md2
-rw-r--r--README.md3
6 files changed, 10 insertions, 19 deletions
diff --git a/.github/bors.toml b/.github/bors.toml
deleted file mode 100644
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
index 989829d..989829d 100644
--- a/.github/bors_log_expected_warnings
+++ b/.github/log_expected_warnings
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 5485763..841dde2 100644
--- 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 82901ea..cae7133 100644
--- 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 98cd889..26f5618 100644
--- 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 bd79c4a..afe2a9e 100644
--- 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.