aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/bors.toml15
-rw-r--r--.github/workflows/ci.yml4
-rw-r--r--.github/workflows/clippy.yml4
-rw-r--r--.github/workflows/on-target.yml4
-rw-r--r--.github/workflows/rt-ci.yml4
-rw-r--r--.github/workflows/rustfmt.yml4
-rw-r--r--cortex-m-rt/build.rs2
7 files changed, 16 insertions, 21 deletions
diff --git a/.github/bors.toml b/.github/bors.toml
deleted file mode 100644
index 17cef85..0000000
--- a/.github/bors.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-block_labels = ["needs-decision"]
-delete_merged_branches = true
-required_approvals = 1
-status = [
- "ci-linux (stable)",
- "ci-linux (1.59.0)",
- "rt-ci-linux (stable)",
- "rt-ci-linux (1.59.0)",
- "rt-ci-other-os (macOS-latest)",
- "rt-ci-other-os (windows-latest)",
- "hil-qemu",
- "hil-compile-rtt",
- "rustfmt",
- "clippy",
-]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0d9b2b4..16456af 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,7 +1,9 @@
on:
push:
- branches: [ staging, trying, master ]
+ branches-ignore:
+ - "gh-readonly-queue/**"
pull_request:
+ merge_group:
name: cortex-m CI
diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
index ecfd0b9..9ae8db4 100644
--- a/.github/workflows/clippy.yml
+++ b/.github/workflows/clippy.yml
@@ -1,7 +1,9 @@
on:
push:
- branches: [ staging, trying, master ]
+ branches-ignore:
+ - "gh-readonly-queue/**"
pull_request_target:
+ merge_group:
name: Clippy check
jobs:
diff --git a/.github/workflows/on-target.yml b/.github/workflows/on-target.yml
index 20121ee..67a1d57 100644
--- a/.github/workflows/on-target.yml
+++ b/.github/workflows/on-target.yml
@@ -1,7 +1,9 @@
on:
push:
- branches: [ staging, trying, master ]
+ branches-ignore:
+ - "gh-readonly-queue/**"
pull_request:
+ merge_group:
# allows manual triggering
workflow_dispatch:
diff --git a/.github/workflows/rt-ci.yml b/.github/workflows/rt-ci.yml
index d46e48a..383e013 100644
--- a/.github/workflows/rt-ci.yml
+++ b/.github/workflows/rt-ci.yml
@@ -1,7 +1,9 @@
on:
push:
- branches: [ staging, trying, master ]
+ branches-ignore:
+ - "gh-readonly-queue/**"
pull_request:
+ merge_group:
name: cortex-m-rt CI
diff --git a/.github/workflows/rustfmt.yml b/.github/workflows/rustfmt.yml
index c29106e..c19695a 100644
--- a/.github/workflows/rustfmt.yml
+++ b/.github/workflows/rustfmt.yml
@@ -1,7 +1,9 @@
on:
push:
- branches: [ staging, trying, master ]
+ branches-ignore:
+ - "gh-readonly-queue/**"
pull_request:
+ merge_group:
name: Code formatting check
diff --git a/cortex-m-rt/build.rs b/cortex-m-rt/build.rs
index 2b65cdf..9334d16 100644
--- a/cortex-m-rt/build.rs
+++ b/cortex-m-rt/build.rs
@@ -56,7 +56,7 @@ INCLUDE device.x"#
240
} else {
// Non ARM target. We assume you're just testing the syntax.
- // This value seems as soon as any
+ // This value seems as good as any.
240
};