From fa1f501f0b715a1629211354c72db317d176ac60 Mon Sep 17 00:00:00 2001 From: Ryan Summers Date: Thu, 29 Apr 2021 12:58:04 +0200 Subject: [PATCH 1/5] Updating dependencies --- Cargo.toml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4ab885e..226e4d4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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 = [ ] From eeb15efdff95657e2917ccb6585bcb72c8be0e86 Mon Sep 17 00:00:00 2001 From: Ryan Summers Date: Thu, 29 Apr 2021 13:20:26 +0200 Subject: [PATCH 2/5] Adding lockfile --- Cargo.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index aef5a92..ae9ef69 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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", From d6cc8f7ed5415905e33a8f6b86928cbb3e889b70 Mon Sep 17 00:00:00 2001 From: Ryan Summers Date: Thu, 29 Apr 2021 14:07:42 +0200 Subject: [PATCH 3/5] Adding bors timeout --- .github/bors.toml | 1 + .github/workflows/hitl_trigger.yml | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/bors.toml b/.github/bors.toml index 5d1bf89..1733a86 100644 --- a/.github/bors.toml +++ b/.github/bors.toml @@ -1,5 +1,6 @@ block_labels = [ "S-blocked" ] delete_merged_branches = true +timeout_sec = 1200 status = [ "style", "test (stable)", diff --git a/.github/workflows/hitl_trigger.yml b/.github/workflows/hitl_trigger.yml index b275421..a8494b3 100644 --- a/.github/workflows/hitl_trigger.yml +++ b/.github/workflows/hitl_trigger.yml @@ -12,15 +12,24 @@ 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: From 7906ef2f9d6bb94355ac1abd680f3f23f8ad4f4e Mon Sep 17 00:00:00 2001 From: Ryan Summers Date: Thu, 29 Apr 2021 14:12:22 +0200 Subject: [PATCH 4/5] Updating trigger --- .github/workflows/hitl_trigger.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/hitl_trigger.yml b/.github/workflows/hitl_trigger.yml index a8494b3..b108ba6 100644 --- a/.github/workflows/hitl_trigger.yml +++ b/.github/workflows/hitl_trigger.yml @@ -21,7 +21,8 @@ jobs: name: HITL Run Status status: in_progress details_url: "https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}" - output: { "summary": "Starting..." } + output: | + {"summary": "Starting..."} - uses: peter-evans/repository-dispatch@v1 with: From c9f61143f5f4d3dcf260b331426f445420a0fa89 Mon Sep 17 00:00:00 2001 From: Ryan Summers Date: Thu, 29 Apr 2021 14:15:16 +0200 Subject: [PATCH 5/5] Updating JSON syntax --- .github/workflows/hitl_trigger.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hitl_trigger.yml b/.github/workflows/hitl_trigger.yml index b108ba6..b0fafac 100644 --- a/.github/workflows/hitl_trigger.yml +++ b/.github/workflows/hitl_trigger.yml @@ -30,7 +30,7 @@ jobs: event-type: stabilizer repository: quartiq/hitl client-payload: | - '{"github": ${{ toJson(github) }}, "check_id": ${{steps.hitl-check.outputs.check_id}}}' + {"github": ${{ toJson(github) }}, "check_id": ${{steps.hitl-check.outputs.check_id}}} - uses: fountainhead/action-wait-for-check@v1.0.0 with: