Skip to content

Update go version and deps#50

Merged
dvail merged 3 commits intomasterfrom
dv/update-go-version-and-deps
Jul 26, 2024
Merged

Update go version and deps#50
dvail merged 3 commits intomasterfrom
dv/update-go-version-and-deps

Conversation

@dvail
Copy link
Copy Markdown
Contributor

@dvail dvail commented Jul 26, 2024

Bumps to a more recent version of go, one patch release higher than the version declared in stackrox/stackrox.

go mod edit -go 1.21.9
go get -u
go mod tidy

Testing:

go test -v ./resolver
go test -v ./yarn

go build && mv ossls ~/bin

Test the output of make ossls-notice on stackrox before and after the change:

$ make ossls-notice
$ diff -rq image/rhel/THIRD_PARTY_NOTICES image/rhel/THIRD_PARTY_NOTICES.pre-mod
Files image/rhel/THIRD_PARTY_NOTICES/manifest.csv and image/rhel/THIRD_PARTY_NOTICES.pre-mod/manifest.csv differ

Manual inspection of both manifest.csv files shows a slight change in the ordering, but otherwise contents is the same. The updated ossls seems to handle version numbers in ascending order now, e.g. with difft:

2340 wrap-ansi,7.0.0,./wrap-ansi7.0.0                       ....
2341 wrap-ansi,6.2.0,./wrap-ansi6.2.0                       2340 wrap-ansi,6.2.0,./wrap-ansi6.2.0
....                                                        2341 wrap-ansi,7.0.0,./wrap-ansi7.0.0

@dvail dvail requested review from RTann, davdhacs and tommartensen July 26, 2024 14:14
@dvail dvail marked this pull request as ready for review July 26, 2024 15:27
Comment thread go.mod Outdated
@RTann
Copy link
Copy Markdown

RTann commented Jul 26, 2024

This seems unrelated to the other PR you have. I think this should just be based on the master/main branch and may be merged before that other PR

@dvail dvail changed the base branch from dv/add-support-for-npm-package-lock to master July 26, 2024 17:00
@dvail dvail force-pushed the dv/update-go-version-and-deps branch from 3795271 to 54090bf Compare July 26, 2024 17:01
Comment thread go.mod Outdated
@dvail dvail force-pushed the dv/update-go-version-and-deps branch from 54090bf to dd33f9d Compare July 26, 2024 17:18
@dvail dvail merged commit f298dae into master Jul 26, 2024
@dvail dvail deleted the dv/update-go-version-and-deps branch July 26, 2024 20:46
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.

2 participants