summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorNicolas R <nicolas@atoomic.org>2020-10-01 14:52:05 -0600
committerNicolas R <nicolas@atoomic.org>2020-10-01 14:52:06 -0600
commit8a24d4166801085d81e9b6bd0adb1a77919a7b61 (patch)
treee3d0959f2305625588712334ea9b304c157ac5f2 /.github
parent45b19fd5977c292eac2555bfff6733c2b44e9d61 (diff)
downloadperl-8a24d4166801085d81e9b6bd0adb1a77919a7b61.tar.gz
Sleep before running auto-label-merge-conflicts
Alternatively we could retry on errors. This is a known limitation as we use the mergeable status which is computed async by GitHub. Upstream-URL: https://github.com/mschilde/auto-label-merge-conflicts/issues/37
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/detect-conflicts.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/.github/workflows/detect-conflicts.yml b/.github/workflows/detect-conflicts.yml
index 12ca41f380..b66992a878 100644
--- a/.github/workflows/detect-conflicts.yml
+++ b/.github/workflows/detect-conflicts.yml
@@ -7,6 +7,8 @@ jobs:
runs-on: ubuntu-latest
if: ( github.event.pull_request.head.repo.full_name == 'Perl/perl5' || github.repository == 'Perl/perl5' )
steps:
+ # improve the chance that the mergeable status is computed
+ - run: sleep 300
- uses: mschilde/auto-label-merge-conflicts@master
with:
CONFLICT_LABEL_NAME: "hasConflicts"