diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7bee0bb2329..6a8eb714ebc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,6 +10,8 @@ on: - reopened - synchronize - ready_for_review + merge_group: + branches: [ main ] env: CARGO_TERM_COLOR: always @@ -108,7 +110,7 @@ jobs: - uses: actions-rust-lang/audit@v1 name: Audit Rust Dependencies - # Full cross-platform tests required by bors to merge on main branch + # Full cross-platform tests required to merge on main branch full: name: full needs: sanity @@ -219,7 +221,7 @@ jobs: files: lcov.info fail_ci_if_error: false - build: # quick hack because bors wrongly detect matrix jobs status + build: # quick hack because bors wrongly detect matrix jobs status. Note: May not be needed with GitHub Merge Queues. needs: full runs-on: ubuntu-latest steps: diff --git a/README.md b/README.md index 7d894a09efa..aa4940fe067 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,6 @@ # Massa: The Decentralized and Scaled Blockchain [![CI](https://github.com/massalabs/massa/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/massalabs/massa/actions/workflows/ci.yml?query=branch%3Amain) -[![Bors enabled](https://bors.tech/images/badge_small.svg)](https://app.bors.tech/repositories/39543) [![Docs](https://img.shields.io/static/v1?label=docs&message=massa&color=&style=flat)](https://massalabs.github.io/massa/massa_node/) [![Open in Gitpod](https://shields.io/badge/Gitpod-contribute-brightgreen?logo=gitpod&style=flat)](https://gitpod.io/#https://github.com/massalabs/massa) [![codecov](https://codecov.io/gh/massalabs/massa/graph/badge.svg?token=598URC32TV)](https://codecov.io/gh/massalabs/massa) diff --git a/bors.toml b/bors.toml deleted file mode 100644 index b88078f847b..00000000000 --- a/bors.toml +++ /dev/null @@ -1,3 +0,0 @@ -status = ["build"] -delete_merged_branches = false -timeout_sec = 36000 # ten hours