Merge branch 'feature/mqtt-rework' into feature/telemetry

This commit is contained in:
Ryan Summers 2021-04-29 14:56:25 +02:00
commit 9e355ca573
4 changed files with 21 additions and 14 deletions

1
.github/bors.toml vendored
View File

@ -1,5 +1,6 @@
block_labels = [ "S-blocked" ]
delete_merged_branches = true
timeout_sec = 1200
status = [
"style",
"test (stable)",

View File

@ -12,15 +12,25 @@ jobs:
runs-on: ubuntu-latest
environment: hitl
steps:
- uses: LouisBrunner/checks-action@v1.1.1
id: hitl-check
with:
repo: ${{ github.repository }}
sha: ${{ github.event.head_commit.id }}
token: ${{ github.token }}
name: HITL Run Status
status: in_progress
details_url: "https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}"
output: |
{"summary": "Starting..."}
- uses: peter-evans/repository-dispatch@v1
with:
token: ${{ secrets.DISPATCH_PAT }}
event-type: stabilizer
repository: quartiq/hitl
client-payload: '{"github": ${{ toJson(github) }}}'
- name: Wait for startup
run: sleep 30
client-payload: |
{"github": ${{ toJson(github) }}, "check_id": ${{steps.hitl-check.outputs.check_id}}}
- uses: fountainhead/action-wait-for-check@v1.0.0
with:

10
Cargo.lock generated
View File

@ -203,7 +203,7 @@ dependencies = [
[[package]]
name = "derive_miniconf"
version = "0.1.0"
source = "git+https://github.com/quartiq/miniconf.git?rev=c8d819c#c8d819cdab65f18396e65dafa3558daea29e3031"
source = "git+https://github.com/quartiq/miniconf.git?rev=c6f2b28#c6f2b28f735e27b337eaa986846536e904c6f2bd"
dependencies = [
"proc-macro2",
"quote",
@ -416,10 +416,9 @@ dependencies = [
[[package]]
name = "miniconf"
version = "0.1.0"
source = "git+https://github.com/quartiq/miniconf.git?rev=c8d819c#c8d819cdab65f18396e65dafa3558daea29e3031"
source = "git+https://github.com/quartiq/miniconf.git?rev=c6f2b28#c6f2b28f735e27b337eaa986846536e904c6f2bd"
dependencies = [
"derive_miniconf",
"heapless 0.6.1",
"serde",
"serde-json-core",
]
@ -689,8 +688,9 @@ dependencies = [
[[package]]
name = "serde-json-core"
version = "0.2.0"
source = "git+https://github.com/rust-embedded-community/serde-json-core.git?rev=da460d1#da460d123e217f0e822a3977eb2170ed5d279d5e"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39af17f40c2a28d2c9a7918663ddc8a10f54cc6f109ead5c3f010869761df186"
dependencies = [
"heapless 0.6.1",
"ryu",

View File

@ -56,7 +56,7 @@ version = "0.9.0"
[patch.crates-io.miniconf]
git = "https://github.com/quartiq/miniconf.git"
rev = "c8d819c"
rev = "c6f2b28"
[dependencies.smoltcp-nal]
git = "https://github.com/quartiq/smoltcp-nal.git"
@ -66,10 +66,6 @@ rev = "8468f11"
git = "https://github.com/quartiq/minimq.git"
rev = "b3f364d"
[patch.crates-io.serde-json-core]
git = "https://github.com/rust-embedded-community/serde-json-core.git"
rev = "da460d1"
[features]
semihosting = ["panic-semihosting", "cortex-m-log/semihosting"]
bkpt = [ ]