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

bib: bump go to v1.21 and images lib to v0.69.0 #515

Merged
merged 2 commits into from
Jul 4, 2024

Conversation

yoheiueda
Copy link
Contributor

This patch bumps the version of the images library to v0.69.0 as well as go to v1.21, since the library requires the Go version.

This version includes a necessary fix to support partition layouts for non-UEFI platforms. osbuild/images#758

I created this patch using the following commands.

go mod edit -go 1.21 -require github.com/osbuild/[email protected]
go mod tidy

@yoheiueda
Copy link
Contributor Author

images v0.69.0 causes the following lint error.

https://github.com/osbuild/bootc-image-builder/actions/runs/9757284982/job/26997810315?pr=515#step:6:31

Running [/home/runner/golangci-lint-1.55.2-linux-amd64/golangci-lint run --path-prefix=bib --timeout 5m0s] in [/home/runner/work/bootc-image-builder/bootc-image-builder/bib] ...
  Error: bib/cmd/bootc-image-builder/partition_tables.go:4:2: "github.com/osbuild/images/pkg/arch" imported and not used (typecheck)
  	"github.com/osbuild/images/pkg/arch"
  	^
  
  Error: issues found

This error was due to the lack of build tags specified to golangci-lint

CONTAINERS_STORAGE_THIN_TAGS="containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_devicemapper"

.golangci.yaml Outdated Show resolved Hide resolved
@yoheiueda yoheiueda mentioned this pull request Jul 4, 2024
@achilleas-k achilleas-k self-requested a review July 4, 2024 09:57
Copy link
Member

@achilleas-k achilleas-k left a comment

Choose a reason for hiding this comment

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

You need to also update the go version in the Lint & unittests job, otherwise the runner will use go 1.20 to lint the project. This always results in weird errors like the ones we're seeing (unused imports).

The build flags added in the second commit shouldn't be necessary.

yoheiueda and others added 2 commits July 4, 2024 12:32
This patch bumps the version of the images library to v0.69.0 as well as
go to v1.21, since the library requires the Go version.

This version includes a necessary fix to support partition layouts for
non-UEFI platforms.
osbuild/images#758

Signed-off-by: Yohei Ueda <[email protected]>
@achilleas-k
Copy link
Member

I updated the Go version in the GitHub workflow.

@achilleas-k achilleas-k requested a review from mvo5 July 4, 2024 10:34
Copy link
Collaborator

@mvo5 mvo5 left a comment

Choose a reason for hiding this comment

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

Thank you!

@mvo5 mvo5 enabled auto-merge July 4, 2024 10:43
@achilleas-k
Copy link
Member

The konflux job is stuck waiting for approval but I don't see any way to approve it -_-

@mvo5 mvo5 added this pull request to the merge queue Jul 4, 2024
@achilleas-k
Copy link
Member

achilleas-k commented Jul 4, 2024

Never mind. The PR was just blocked on my previews request for changes.

Merged via the queue into osbuild:main with commit 6ffa7eb Jul 4, 2024
6 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants