Skip to content

Commit 43a9767

Browse files
authored
Merge pull request #652 from stm32-rs/merge-queue
replace bors with merge queue
2 parents ca3a196 + 46d995e commit 43a9767

File tree

3 files changed

+12
-24
lines changed

3 files changed

+12
-24
lines changed

.github/bors.toml

Lines changed: 0 additions & 23 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
11
on:
22
push:
3-
branches: [ staging, trying, master ]
3+
branches: master
44
pull_request:
5+
merge_group:
56

67
name: Continuous integration
78

89
jobs:
910
ci:
11+
name: CI
12+
runs-on: ubuntu-latest
13+
needs: [check]
14+
if: always()
15+
steps:
16+
- name: Done
17+
run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'
18+
19+
check:
1020
runs-on: ubuntu-latest
1121
strategy:
1222
matrix:

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
77

88
## [Unreleased]
99

10+
- bors bot replaced with GH merge queue
1011
- Integrate new version of stm32_i2s (v0.5) to enable full-duplex operation
1112
- Add a rtic example to show how to do full-duplex i2s
1213

0 commit comments

Comments
 (0)