From 6a7f761d7329ba155e2925decbf6a255441d83ee Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 3 Aug 2020 12:20:23 +1000 Subject: [PATCH] .github/workflows/wait-ofborg.yml: double timeout if staging --- .github/workflows/wait-ofborg.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wait-ofborg.yml b/.github/workflows/wait-ofborg.yml index 35c58b2e912..3b40586fc27 100644 --- a/.github/workflows/wait-ofborg.yml +++ b/.github/workflows/wait-ofborg.yml @@ -7,9 +7,12 @@ jobs: steps: - name: Wait for ofborg CI run: | - # wait for ~30min... + # eval sometimes takes a bit longer on staging. + if [[ "$BASE_BRANCH" == "refs/heads/staging" ]]; then + COUNTDOWN=$((COUNTDOWN*2)) + fi # ..in future a better fix would be to make ofborg mark CI as pending right away. - for i in $(seq 360); do + for i in $(seq "$COUNTDOWN"); do res=$(curl --silent \ -H "Accept: application/vnd.github.antiope-preview+json" \ -H "Authorization: token ${GITHUB_TOKEN}" \ @@ -26,6 +29,8 @@ jobs: # ofborg is not checking forks. if: github.repository_owner == 'NixOS' env: + BASE_BRANCH: ${{ github.base_ref }} + COUNTDOWN: 360 # wait for ~30min... GITHUB_TOKEN: ${{ github.token }} COMMIT: ${{ github.event.pull_request.head.sha }} OFBORG_APP_ID: 20500