retry change detection #598
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| name: CI | ||
|
|
||
| on: | ||
| pull_request: | ||
| types: [ labeled ] | ||
|
|
||
| jobs: | ||
| build: | ||
| if: ${{ contains( github.event.label.name, 'needs-go-generate') }} | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - name: Fail on needs-go-generate | ||
| run: echo Failed, needs go generate. && exit 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| make/repo.Makefile |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,14 +4,15 @@ import ( | |
| "context" | ||
| "encoding/json" | ||
| "fmt" | ||
| "github.com/avast/retry-go" | ||
| "github.com/google/go-github/v41/github" | ||
| "github.com/synapsecns/sanguine/contrib/git-changes-action/detector/actionscore" | ||
| "github.com/synapsecns/sanguine/contrib/git-changes-action/detector/tree" | ||
| "golang.org/x/exp/slices" | ||
| "golang.org/x/oauth2" | ||
| "os" | ||
| "strings" | ||
| "time" | ||
| ) | ||
|
|
||
| // GetChangeTree returns the ref for the given event name. | ||
|
|
@@ -64,15 +65,27 @@ func getChangedFilesFromAPI(ctx context.Context, ghContext *actionscore.Context, | |
| ct = tree.NewTree() | ||
|
|
||
| page := 1 | ||
| const retryCount = 10 | ||
| const perPage = 100 | ||
| for { | ||
| var files []*github.CommitFile | ||
| var res *github.Response | ||
| err = retry.Do(func() error { | ||
| reqCtx, cancel := context.WithTimeout(ctx, 15*time.Second) | ||
| defer cancel() | ||
|
|
||
| files, res, err = client.PullRequests.ListFiles(reqCtx, repoOwner, repoName, prNumber, &github.ListOptions{ | ||
| Page: page, | ||
| PerPage: perPage, | ||
| }) | ||
| if err != nil { | ||
| return fmt.Errorf("could not get files for repoOwner %s, repoName %s, prNumber %d, page number %d with page size %d: %w", | ||
| repoOwner, repoName, prNumber, page, perPage, err) | ||
| } | ||
| return nil | ||
| }, retry.Context(ctx), retry.Attempts(retryCount)) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("could not get files after %d retries: %w", retryCount, err) | ||
|
There was a problem hiding this comment. Maybe include the information I had in my log about the page number and repoName and prNumber and repoOwner? There was a problem hiding this comment. done and wrapped above |
||
| } | ||
|
|
||
| for _, file := range files { | ||
|
|
@@ -84,7 +97,7 @@ func getChangedFilesFromAPI(ctx context.Context, ghContext *actionscore.Context, | |
| } | ||
| } | ||
|
|
||
| if res.NextPage == 0 { | ||
|
There was a problem hiding this comment. I am not sure this will work? Keeping it res.LastPage worked for me in the messaging branch that had multiple pages. There was a problem hiding this comment.
I ran it w/ a fmt.Println and you can see the last page detection not working here https://github.com/synapsecns/sanguine/actions/runs/4309209034/jobs/7516328981 It'd get to 12 and then reset to 1. res.LastPage can be 0 when the cursor is lost |
||
| break | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I spent so much time on this :-)