-
Notifications
You must be signed in to change notification settings - Fork 60
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.
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
Bump sourcegraph dependency to fix version parsing of insiders #959
Conversation
For untagged versions, we added the current Sourcegraph version as well, so the parsing didn't work anymore. This fixes it.
@@ -113,7 +113,7 @@ BUCKET | |||
progress := out.Progress(progressBars, nil) | |||
progress.WriteLine(output.Emoji(output.EmojiHourglass, "Starting uploads...")) | |||
bucket := c.Bucket(*bucketName) | |||
g := group.New().WithErrors().WithContext(ctx) | |||
g := pool.New().WithErrors().WithContext(ctx) |
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.
Shiny!
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 had to, the lib/group
package was deleted :lolsob: 😬
oh boi this is a big mess. conc requires go 1.19, but then golangci-lint fails because it doesn't understand 1.19 in that version, and when I upgrade it it starts complaining about new stuff - really annoying. |
@BolajiOlajide @Piszmog could I get a quick re-review on this, I had to do a bunch of changes to get it to compile with conc as a dependency. |
@@ -67,9 +67,11 @@ func (e *fastCommandTimeoutError) Error() string { | |||
|
|||
func (*fastCommandTimeoutError) Timeout() bool { return true } | |||
|
|||
type fastCommandTimeoutKey string |
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.
Why do we need this type?
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.
golangci-lint reminded me that using a custom type the string is ensured to always be globally unique, if it's a plain string it might have clashes with other ctx keys - pretty interesting magic honestly
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.
Oh interesting.
@@ -185,6 +185,8 @@ func (svc *Service) uploadFile(ctx context.Context, workingDir, filePath, batchS | |||
// Errors passed to pipeWriter.CloseWithError come through here. | |||
return err | |||
} | |||
defer resp.Body.Close() |
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.
Yikes!
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.
Thanks for catching.
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.
golangci-lint did, I know nothing 😆
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.
Oh, nice. I like.
For untagged versions, we added the current Sourcegraph version as well, so the parsing didn't work anymore. This fixes it.
For untagged versions, we added the current Sourcegraph version as well, so the parsing didn't work anymore. This fixes it.
Test plan
Verified the error no longer shows when targeting S2.