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.

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

chore: update buildkit to 1.13.1 #532

Merged
merged 7 commits into from
Mar 18, 2024

Conversation

sozercan
Copy link
Member

@sozercan sozercan commented Mar 16, 2024

Describe the changes in this pull request using active verbs such as Add, Remove, Replace ...

  • updates buildkit to 0.13.1
  • debug uses plain mode

Closes #<issue_ID>

Signed-off-by: Sertac Ozercan <sozercan@gmail.com>
Copy link

codecov bot commented Mar 16, 2024

Codecov Report

Attention: Patch coverage is 6.25000% with 15 lines in your changes are missing coverage. Please review.

Project coverage is 35.63%. Comparing base (2602d59) to head (29127c7).
Report is 21 commits behind head on main.

Files Patch % Lines
pkg/patch/patch.go 0.00% 8 Missing ⚠️
pkg/buildkit/buildkit.go 0.00% 4 Missing ⚠️
pkg/buildkit/connhelpers/docker.go 0.00% 0 Missing and 1 partial ⚠️
pkg/patch/cmd.go 0.00% 0 Missing and 1 partial ⚠️
pkg/report/report.go 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #532      +/-   ##
==========================================
+ Coverage   32.51%   35.63%   +3.12%     
==========================================
  Files          17       17              
  Lines        1621     1305     -316     
==========================================
- Hits          527      465      -62     
+ Misses       1062      808     -254     
  Partials       32       32              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

pkg/patch/patch.go Outdated Show resolved Hide resolved
sozercan and others added 2 commits March 18, 2024 18:03
Signed-off-by: Sertac Ozercan <sozercan@gmail.com>
@sozercan sozercan requested a review from cpuguy83 March 18, 2024 18:04
Comment on lines 234 to 245
var c console.Console
if cn, err := console.ConsoleFromFile(os.Stderr); err == nil {
c = cn
}
mode := progressui.AutoMode
if log.GetLevel() >= log.DebugLevel {
mode = progressui.PlainMode
}
display, err := progressui.NewDisplay(c, mode)
if err != nil {
return err
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
var c console.Console
if cn, err := console.ConsoleFromFile(os.Stderr); err == nil {
c = cn
}
mode := progressui.AutoMode
if log.GetLevel() >= log.DebugLevel {
mode = progressui.PlainMode
}
display, err := progressui.NewDisplay(c, mode)
if err != nil {
return err
}
out := os.Stderr
if cf, _ := console.ConsoleFromFile(os.Stderr); cf != nil {
out = cf
}
mode := progressui.AutoMode
if log.GetLevel() >= log.DebugLevel {
mode = progressui.PlainMode
}
display, err := progressui.NewDisplay(out, mode)
if err != nil {
return err
}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cpuguy83 i removed ConsoleFromFile completely, wdyt?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think if you do that it will never do TTY mode?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tested and works with tty (output is glitchy for whatever reason on my terminal, but it was the same before)

Signed-off-by: Sertac Ozercan <sozercan@gmail.com>
Signed-off-by: Sertac Ozercan <sozercan@gmail.com>
Signed-off-by: Sertac Ozercan <sozercan@gmail.com>
@sozercan sozercan requested a review from cpuguy83 March 18, 2024 20:17
Signed-off-by: Sertac Ozercan <sozercan@gmail.com>
@sozercan sozercan changed the title chore: update buildkit to 1.3.0 chore: update buildkit to 1.3.1 Mar 18, 2024
@sozercan sozercan changed the title chore: update buildkit to 1.3.1 chore: update buildkit to 1.13.1 Mar 18, 2024
@sozercan sozercan merged commit 6210452 into project-copacetic:main Mar 18, 2024
18 checks passed
@sozercan sozercan deleted the chore-buildkit-130 branch March 18, 2024 20:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants