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

tools: use go toolbox instead of installing a binary #4600

Merged

Conversation

achilleas-k
Copy link
Member

@achilleas-k achilleas-k commented Feb 6, 2025

Repeat of 8554d62.

This is a much nicer (and newer) way of handling the Go version for the
project. The issue that caused the previous revert was that the toolbox
version was being set to 1.22.0, which is older than what some
dependencies require, specifically osbuild/images, so the 'go mod tidy'
would downgrade images to match the required toolbox version.

Setting the go and toolbox version to 1.22.6 should make it all work as
expected.

This reverts commit 7e87d1e.

Co-authored-by: Lukáš Zapletal [email protected]

@achilleas-k achilleas-k requested review from lzap and thozza February 6, 2025 12:24
@achilleas-k achilleas-k force-pushed the tools/prepare-source/update-again branch from e13e4f2 to 0292a13 Compare February 6, 2025 12:54
@achilleas-k
Copy link
Member Author

Rebased on main and updated commit ID for the revert in the commit message.

@achilleas-k achilleas-k requested a review from bcl February 6, 2025 12:55
bcl
bcl previously approved these changes Feb 6, 2025
@achilleas-k achilleas-k force-pushed the tools/prepare-source/update-again branch from 0292a13 to d0490ad Compare February 6, 2025 16:37
@achilleas-k achilleas-k requested a review from a team as a code owner February 6, 2025 16:37
@achilleas-k achilleas-k requested review from mvo5, schuellerf and bcl and removed request for a team February 6, 2025 16:37
bcl
bcl previously approved these changes Feb 6, 2025
Copy link
Contributor

@bcl bcl left a comment

Choose a reason for hiding this comment

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

That's better! ;)

lzap
lzap previously approved these changes Feb 7, 2025
Copy link
Contributor

@lzap lzap left a comment

Choose a reason for hiding this comment

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

Yeah I really hope this will work, cos once we update to 1.24 with its tool version fix that will be a complete and hassle-free experience, finally!

lzap
lzap previously approved these changes Feb 7, 2025
Copy link
Contributor

@lzap lzap left a comment

Choose a reason for hiding this comment

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

Awesome!

@ezr-ondrej ezr-ondrej force-pushed the tools/prepare-source/update-again branch from 7b317f4 to 3e4187b Compare February 10, 2025 18:00
@achilleas-k achilleas-k force-pushed the tools/prepare-source/update-again branch from 3e4187b to db881ef Compare February 11, 2025 15:50
@achilleas-k achilleas-k force-pushed the tools/prepare-source/update-again branch from db881ef to d7a7481 Compare February 11, 2025 16:25
@achilleas-k
Copy link
Member Author

Had to downgrade to Go 1.22.11 because Fedora 40 doesn't have .12

@achilleas-k achilleas-k force-pushed the tools/prepare-source/update-again branch from d7a7481 to 19b51fd Compare February 12, 2025 17:34
achilleas-k and others added 2 commits February 13, 2025 11:31
Repeat of 8554d62.

This is a much nicer (and newer) way of handling the Go version for the
project.  The issue that caused the previous revert was that the toolbox
version was being set to 1.22.0, which is older than what some
dependencies require, specifically osbuild/images, so the 'go mod tidy'
would downgrade images to match the required toolbox version.

Setting the go and toolbox version to 1.22.6 should make it all work as
expected.

This reverts commit 7e87d1e.

Co-authored-by: Lukáš Zapletal <[email protected]>
Use endoflife.date to check for newer versions of the minor Go version
we're using and print a notice.
@achilleas-k achilleas-k force-pushed the tools/prepare-source/update-again branch from 19b51fd to 2b56e8a Compare February 13, 2025 10:31
@achilleas-k
Copy link
Member Author

I dropped the last commit that updates the Go version. We still have RHEL 8.10 and 9.4 RPM builds going on here, so let's just get the new script in and look at distro and compiler versions separately.

@achilleas-k achilleas-k merged commit aac74da into osbuild:main Feb 17, 2025
46 of 50 checks passed
@achilleas-k achilleas-k deleted the tools/prepare-source/update-again branch February 17, 2025 11:42
achilleas-k added a commit to achilleas-k/images that referenced this pull request Feb 17, 2025
Running ./tools/prepare-source.sh in osbuild-composer now requires jq
for the version check.

osbuild/osbuild-composer#4600
achilleas-k added a commit to achilleas-k/images that referenced this pull request Feb 17, 2025
Running ./tools/prepare-source.sh in osbuild-composer now requires jq
for the version check.

osbuild/osbuild-composer#4600
github-merge-queue bot pushed a commit to osbuild/images that referenced this pull request Feb 18, 2025
Running ./tools/prepare-source.sh in osbuild-composer now requires jq
for the version check.

osbuild/osbuild-composer#4600
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.

4 participants