Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add exponential retries on merge errors #480

Merged
merged 23 commits into from
Aug 19, 2020
Merged

feat: add exponential retries on merge errors #480

merged 23 commits into from
Aug 19, 2020

Commits on Aug 4, 2020

  1. feat: add retry when trying to merge

    Ricardo Souza committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    e686145 View commit details
    Browse the repository at this point in the history

  2. chore: rename variable name

    Ricardo Souza committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    8ed6829 View commit details
    Browse the repository at this point in the history

  3. test: update tests

    Ricardo Souza committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    9289fbb View commit details
    Browse the repository at this point in the history

  4. docs: add entry in readme file

    Ricardo Souza committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    c97bfc0 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2020

  1. chore: swap definition

    Ricardo Souza committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    d1fdb79 View commit details
    Browse the repository at this point in the history

  2. chore: rename 'trial' to 'retryCount'

    Ricardo Souza committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    29742be View commit details
    Browse the repository at this point in the history

  3. chore: rename numberOfRetries to maximumRetries

    Ricardo Souza committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    7f874f6 View commit details
    Browse the repository at this point in the history

  4. test: add check on the retrying log messages (to ensure the backoff h… 

    …appens in the correct time)
    Ricardo Souza committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    e849d10 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2020

  1. Merge branch 'master' into feat/CP-2089_retry_PR_on_merge_errors

    @ricardoatsouza
    ricardoatsouza committed Aug 6, 2020
    Configuration menu
    Copy the full SHA
    06ff5e7 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2020

  1. test: mock endpoint instead of merge function; removes export fru… 

    …n `merge` function
    Ricardo Souza committed Aug 10, 2020
    Configuration menu
    Copy the full SHA
    e28bc57 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2020

  1. Merge branch 'master' into feat/CP-2089_retry_PR_on_merge_errors

    @ricardoatsouza
    ricardoatsouza committed Aug 12, 2020
    Configuration menu
    Copy the full SHA
    a55028f View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2020

  1. feat: add internal parameter for the minimum wait time in merge

    Ricardo Souza committed Aug 14, 2020
    Configuration menu
    Copy the full SHA
    ef0cedc View commit details
    Browse the repository at this point in the history

  2. fix: send "maximumRetries" parameters in "index.ts"

    Ricardo Souza committed Aug 14, 2020
    Configuration menu
    Copy the full SHA
    18e4918 View commit details
    Browse the repository at this point in the history

  3. feat: retries only on a specific error (and update tests)

    Ricardo Souza committed Aug 14, 2020
    Configuration menu
    Copy the full SHA
    7cf6771 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feat/CP-2089_retry_PR_on_merge_errors' of github.com:ri… 

    …dedott/merge-me-action into feat/CP-2089_retry_PR_on_merge_errors
    Ricardo Souza committed Aug 14, 2020
    Configuration menu
    Copy the full SHA
    b7d4dd0 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into feat/CP-2089_retry_PR_on_merge_errors

    @ricardoatsouza
    ricardoatsouza committed Aug 14, 2020
    Configuration menu
    Copy the full SHA
    b43e47a View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2020

  1. test: remove mergeWithRetry check

    Ricardo Souza committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    d0b59dc View commit details
    Browse the repository at this point in the history

  2. test: checks if merge function throws when a different error is given

    Ricardo Souza committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    d5400ab View commit details
    Browse the repository at this point in the history

  3. test: remove minimum time parameter

    Ricardo Souza committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    2032586 View commit details
    Browse the repository at this point in the history

  4. test: test backoff by mocking setTimeout

    Ricardo Souza committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    aabf783 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into feat/CP-2089_retry_PR_on_merge_errors

    @ricardoatsouza
    ricardoatsouza committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    95c4ed4 View commit details
    Browse the repository at this point in the history

  6. fix: lint

    Ricardo Souza committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    020ed6d View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into feat/CP-2089_retry_PR_on_merge_errors

    @ricardoatsouza
    ricardoatsouza committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    2665e62 View commit details
    Browse the repository at this point in the history