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

Upsteam merge #10

Merged
merged 10 commits into from
Jun 12, 2024
Merged

Upsteam merge #10

merged 10 commits into from
Jun 12, 2024

Commits on May 15, 2024

  1. Add pagination to "List files in PR" api call (wayfair-incubator#174) 

    * Support pagination for "List files in PR" API call
+relevant test
    @Oded-B
    Oded-B authored May 15, 2024
    Configuration menu
    Copy the full SHA
    cc7867e View commit details
    Browse the repository at this point in the history

  2. Update golangci/golangci-lint-action action to v6 (wayfair-incubator#170 

    )

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    @renovate
    renovate[bot] authored May 15, 2024
    Configuration menu
    Copy the full SHA
    b7b701f View commit details
    Browse the repository at this point in the history

  3. Update GitHub Actions (wayfair-incubator#144) 

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    @renovate
    renovate[bot] authored May 15, 2024
    Configuration menu
    Copy the full SHA
    af35f90 View commit details
    Browse the repository at this point in the history

  4. Update module github.com/google/go-github/v53 to v62 (wayfair-incubat… 

    …or#173)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    @renovate
    renovate[bot] authored May 15, 2024
    Configuration menu
    Copy the full SHA
    38378c4 View commit details
    Browse the repository at this point in the history

  5. Update all non-major dependencies (wayfair-incubator#136) 

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    @renovate
    renovate[bot] authored May 15, 2024
    Configuration menu
    Copy the full SHA
    1cd0beb View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. fix(automerge): implement exponential backoff (wayfair-incubator#181) 

    * fix(automerge): implement exponential backoff

* Update internal/pkg/githubapi/github.go
    @Ben10k
    Ben10k authored May 24, 2024
    Configuration menu
    Copy the full SHA
    55bcc24 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. Fix > 250 char Branch name issue (wayfair-incubator#188) 

    * Fix > 250 char Branch name issue

Move brnach name generation to a function.
Limit original branch substing to 200 charts
Switch target paths substring to sha1 of the target paths.
Tests

* Address isssus raised in PR reivew

Rename a var
Used Repeat to avoid hardcoding long string
Made some test input **a bit** more realistic
    @Oded-B
    Oded-B authored Jun 12, 2024
    Configuration menu
    Copy the full SHA
    a3b2abe View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/main' into upsteam_merge_test1

    @Oded-B
    Oded-B committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    ab8d0dd View commit details
    Browse the repository at this point in the history

  3. Cleanup some conflict marker and add comment

    @Oded-B
    Oded-B committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    47f1b99 View commit details
    Browse the repository at this point in the history

  4. Fix some merge bug

    @Oded-B
    Oded-B committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    3fdeb92 View commit details
    Browse the repository at this point in the history