diff --git a/.github/bors.toml b/.github/bors.toml deleted file mode 100644 index 732ef5c8dcc2..000000000000 --- 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 5485763c0560..841dde2e7c10 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 .' @@ -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 .' @@ -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 .' diff --git a/.github/workflows/ccpp32alpine.yml b/.github/workflows/ccpp32alpine.yml index 82901ea3c146..cae7133766dc 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 98cd8894ad68..26f5618d779e 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 bd79c4a713c1..39dcad3e3b2e 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")