Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Goodbye bors #77

Merged
merged 3 commits into from
May 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/bors.toml

This file was deleted.

1 change: 1 addition & 0 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
# opened, reopened, synchronize are the default types for pull_request.
# labeled, unlabeled ensure this check is also run if a label is added or removed.
types: [opened, reopened, synchronize, labeled, unlabeled]
merge_group:

name: Changelog

Expand Down
17 changes: 2 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: CI

on:
push:
branches: [main, staging, trying]
pull_request:
branches: [main]
schedule:
# runs 1 min after 2 or 1 AM (summer/winter) berlin time
- cron: "1 0 * * *"
merge_group:

env:
CARGO_TERM_COLOR: always
CORE_TARGET: thumbv7m-none-eabi # needed by `core`
Expand Down Expand Up @@ -72,16 +72,3 @@ jobs:
- run: cargo clippy -- --deny warnings
- run: cargo clippy -- --deny warnings
working-directory: test-flip-link-app/

# Refs: https://github.com/rust-lang/crater/blob/9ab6f9697c901c4a44025cf0a39b73ad5b37d198/.github/workflows/bors.yml#L125-L149
# bors.tech integration
ci-success:
name: ci
if: success()
needs:
- static-checks
- test
runs-on: ubuntu-latest
steps:
- name: CI succeeded
run: exit 0
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

- [#77]: CI: Switch from bors to github merge queue
- [#75]: End of year refactoring
- [#74]: CI: Simplify
- [#72]: CI: Install Rust manually
- [#71]: Add changelog enforcer
- [#71]: CI: Add changelog enforcer
- [#70]: Support addition in ORIGIN

[#77]: https://github.com/knurling-rs/flip-link/pull/xx
[#75]: https://github.com/knurling-rs/flip-link/pull/75
[#74]: https://github.com/knurling-rs/flip-link/pull/74
[#72]: https://github.com/knurling-rs/flip-link/pull/72
Expand Down