From d6cc8f7ed5415905e33a8f6b86928cbb3e889b70 Mon Sep 17 00:00:00 2001 From: Ryan Summers Date: Thu, 29 Apr 2021 14:07:42 +0200 Subject: [PATCH 1/3] 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 2/3] 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 3/3] 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: