Skip to content

Commit

Permalink
Switch to gh merge queues (#4597)
Browse files Browse the repository at this point in the history
* Delete unused bors.toml

* Add merge_group workflow trigger

* Remove Bors mention in README.md

* Update Bors related comments in CI

* Update .github/workflows/ci.yml

Co-authored-by: JF <[email protected]>

---------

Co-authored-by: JF <[email protected]>
  • Loading branch information
Leo-Besancon and bilboquet authored Dec 18, 2023
1 parent 86fa044 commit 23c3e87
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ on:
- reopened
- synchronize
- ready_for_review
merge_group:
branches: [ main ]

env:
CARGO_TERM_COLOR: always
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 0 additions & 3 deletions bors.toml

This file was deleted.

0 comments on commit 23c3e87

Please sign in to comment.