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

Conversation

Oded-B
Copy link
Collaborator

@Oded-B Oded-B commented Jun 12, 2024 •
edited
Loading

Description

Sync upstream changes, like:

  • Fix of 250 chart branch name issue.
  • Retries of merges on 405s
  • Pagination for getting PR files API call
  • GHA version updates

Type of Change

  • Bug Fix
  • New Feature
  • Breaking Change
  • Refactor
  • Documentation
  • Other (please describe)

Checklist

  • I have read the contributing guidelines
  • Existing issues have been referenced (where applicable)
  • I have verified this change is not present in other open pull requests
  • Functionality is documented
  • All code style checks pass
  • New code contribution is covered by automated tests
  • All new and existing tests pass

Oded-B and others added 10 commits May 15, 2024 16:50
@Oded-B
Add pagination to "List files in PR" api call (wayfair-incubator#174)
cc7867e 
* Support pagination for "List files in PR" API call
+relevant test
@renovate
Update golangci/golangci-lint-action action to v6 (wayfair-incubator#170
b7b701f 
)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update GitHub Actions (wayfair-incubator#144)
af35f90 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update module github.com/google/go-github/v53 to v62 (wayfair-incubat…
38378c4 
…or#173)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update all non-major dependencies (wayfair-incubator#136)
1cd0beb 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@Ben10k
fix(automerge): implement exponential backoff (wayfair-incubator#181)
55bcc24 
* fix(automerge): implement exponential backoff

* Update internal/pkg/githubapi/github.go
@Oded-B
Fix > 250 char Branch name issue (wayfair-incubator#188)
a3b2abe 
* 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
Merge remote-tracking branch 'upstream/main' into upsteam_merge_test1
ab8d0dd
@Oded-B
Cleanup some conflict marker and add comment
47f1b99
@Oded-B
Fix some merge bug
3fdeb92
@Oded-B Oded-B marked this pull request as ready for review June 12, 2024 07:55
@gitstream-cm gitStream.cm
Copy link

gitstream-cm bot commented Jun 12, 2024

This PR is missing a Jira ticket reference in the title or description.
Please add a Jira ticket reference to the title or description of this PR.

@gitstream-cm gitStream.cm
Copy link

gitstream-cm bot commented Jun 12, 2024

🥷 Code experts: no user but you matched threshold 10

Oded-B has most 👩‍💻 activity in the files.
Oded-B has most 🧠 knowledge in the files.

See details

.github/workflows/docker-publish-on-comment.yml

Activity based on git-commit:

Oded-B
JUN
MAY
APR 16 additions & 17 deletions
MAR
FEB
JAN

Knowledge based on git-blame:
Oded-B: 78%

.github/workflows/docker-publish.yml

Activity based on git-commit:

Oded-B
JUN
MAY
APR 18 additions & 21 deletions
MAR
FEB
JAN

Knowledge based on git-blame:
Oded-B: 10%

.github/workflows/lint.yml

Activity based on git-commit:

Oded-B
JUN
MAY
APR
MAR
FEB
JAN

Knowledge based on git-blame:

Dockerfile

Activity based on git-commit:

Oded-B
JUN
MAY
APR 1 additions & 2 deletions
MAR
FEB
JAN

Knowledge based on git-blame:
Oded-B: 14%

go.mod

Activity based on git-commit:

Oded-B
JUN
MAY
APR 155 additions & 27 deletions
MAR
FEB
JAN

Knowledge based on git-blame:
Oded-B: 80%

go.sum

Activity based on git-commit:

Oded-B
JUN
MAY
APR 1587 additions & 235 deletions
MAR
FEB
JAN

Knowledge based on git-blame:
Oded-B: 75%

internal/pkg/githubapi/clients.go

Activity based on git-commit:

Oded-B
JUN
MAY
APR
MAR
FEB
JAN

Knowledge based on git-blame:
Oded-B: 98%

internal/pkg/githubapi/drift_detection.go

Activity based on git-commit:

Oded-B
JUN
MAY
APR
MAR
FEB
JAN

Knowledge based on git-blame:
Oded-B: 25%

internal/pkg/githubapi/drift_detection_test.go

Activity based on git-commit:

Oded-B
JUN
MAY
APR
MAR
FEB
JAN

Knowledge based on git-blame:

internal/pkg/githubapi/github.go

Activity based on git-commit:

Oded-B
JUN
MAY 8 additions & 1 deletions
APR 51 additions & 10 deletions
MAR
FEB
JAN

Knowledge based on git-blame:
Oded-B: 44%

internal/pkg/githubapi/promotion.go

Activity based on git-commit:

Oded-B
JUN
MAY
APR 46 additions & 18 deletions
MAR
FEB
JAN

Knowledge based on git-blame:
Oded-B: 20%

internal/pkg/githubapi/promotion_test.go

Activity based on git-commit:

Oded-B
JUN
MAY
APR 47 additions & 0 deletions
MAR
FEB
JAN

Knowledge based on git-blame:
Oded-B: 10%

internal/pkg/githubapi/webhook_proxy.go

Activity based on git-commit:

Oded-B
JUN
MAY
APR
MAR
FEB
JAN

Knowledge based on git-blame:
Oded-B: 100%

internal/pkg/githubapi/webhook_proxy_test.go

Activity based on git-commit:

Oded-B
JUN
MAY
APR
MAR
FEB
JAN

Knowledge based on git-blame:
Oded-B: 100%

internal/pkg/prometheus/prometheus.go

Activity based on git-commit:

Oded-B
JUN
MAY
APR
MAR
FEB
JAN

Knowledge based on git-blame:
Oded-B: 34%

internal/pkg/prometheus/prometheus_test.go

Activity based on git-commit:

Oded-B
JUN
MAY
APR
MAR
FEB
JAN

Knowledge based on git-blame:
Oded-B: 22%

To learn more about /:\ gitStream - Visit our Docs

@Oded-B Oded-B merged commit 0fcbba5 into main Jun 12, 2024
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
20 min review missing-jira
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Oded-B @Ben10k