diff options
| author | Nicolas R <nicolas@atoomic.org> | 2020-10-06 10:18:30 -0600 |
|---|---|---|
| committer | Nicolas R <nicolas@atoomic.org> | 2020-10-06 10:25:07 -0600 |
| commit | e24e47c348372081e6e5f22a7ce4da7ae637afa1 (patch) | |
| tree | 099423187f3b166ce557cc6c683b94832c92f91b /.github | |
| parent | e56f4c3cb4c55da709fffaf7d9684096a4dcebe4 (diff) | |
| download | perl-e24e47c348372081e6e5f22a7ce4da7ae637afa1.tar.gz | |
Custom timeout to detect conflicts
Give more time to the action detecting merge conflicts.
To detect conflicts we rely on the `mergeable` state
from GitHub API. GitHub uses an async job to compute
this state. We have no other way than patience before
being able to detect a conflict.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/detect-conflicts.yml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/.github/workflows/detect-conflicts.yml b/.github/workflows/detect-conflicts.yml index b66992a878..ba81df0b65 100644 --- a/.github/workflows/detect-conflicts.yml +++ b/.github/workflows/detect-conflicts.yml @@ -8,8 +8,11 @@ jobs: 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 + #- uses: mschilde/auto-label-merge-conflicts@master + # use fork to use custom timeout need https://github.com/mschilde/auto-label-merge-conflicts/pull/43 + - uses: atoomic/auto-label-merge-conflicts@custom with: CONFLICT_LABEL_NAME: "hasConflicts" GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + MAX_RETRIES: 600 # 600 * 10 sec => 100 minutes + WAIT_MS: 10000 # 10 sec |