Skip to content

Commit

Permalink
replace bors with merge queue
Browse files Browse the repository at this point in the history
  • Loading branch information
richardeoin committed Jul 9, 2023
1 parent a2d8a0f commit 172a6fe
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
1 change: 0 additions & 1 deletion .github/bors.toml

This file was deleted.

22 changes: 12 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
on:
push:
branches: [ staging, trying, master ]
branches: master
pull_request:
merge_group:

name: Continuous integration

Expand All @@ -10,6 +11,16 @@ env:
TARGET: thumbv7em-none-eabihf

jobs:
ci:
name: CI
runs-on: ubuntu-latest
needs: [check]
if: always()
steps:
- name: Done
run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'

check:
test:
runs-on: ubuntu-latest
strategy:
Expand Down Expand Up @@ -63,12 +74,3 @@ jobs:
components: rustfmt
- name: Check code formatting
run: cargo fmt -- --check

ci:
if: ${{ success() }}
# all new jobs must be added to this list
needs: [test, lint]
runs-on: ubuntu-latest
steps:
- name: CI succeeded
run: exit 0
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Unreleased

* bors bot replaced with GH merge queue
* Rename method `set_interrupt_line_config` to `select_interrupt_line_1` [#27]

## [v0.1.2] 2022-09-13
Expand Down

0 comments on commit 172a6fe

Please sign in to comment.