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

Bump the golang.org/x/exp dependency and fix a build breakage. #2088

Merged
merged 3 commits into from
Sep 7, 2023

Conversation

dlorenc
Copy link
Contributor

@dlorenc dlorenc commented Sep 3, 2023

This was causing a conflict for us in some code that imports syft.

This was causing a conflict for us in some code that imports syft.

Signed-off-by: Dan Lorenc <dlorenc@chainguard.dev>
@spiffcs
Copy link
Contributor

spiffcs commented Sep 7, 2023

Thanks @dlorenc! Let me get the conflicts resolved here and I'll try and have this merged and ready for the next release ASAP

* main:
  chore(deps): update bootstrap tools to latest versions (anchore#2086)
  chore(deps): update CPE dictionary index (anchore#2089)
  chore(deps): bump github.com/saferwall/pe from 1.4.4 to 1.4.5 (anchore#2096)
  chore(deps): bump github.com/docker/docker (anchore#2098)
  chore(deps): bump golang.org/x/net from 0.14.0 to 0.15.0 (anchore#2099)
  feat(cmd/update): add UA header with current ver when check for update (anchore#2100)
  fix(cdx): validate external refs before encoding (anchore#2091)
  expose cobra command in cli package (anchore#2097)

Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
@spiffcs
Copy link
Contributor

spiffcs commented Sep 7, 2023

Just a quick note on this PR - after we update the CI files with the correct Go version we'll still need to check current consumers of syft within our own tooling and what they look like when upgraded to v1.21 if there are no issues then we can start upgrading each consumer to use v1.21. Then we can merge this PR into Syft.

Thanks again for the contribution/fix!

@spiffcs
Copy link
Contributor

spiffcs commented Sep 7, 2023

related PR - #2067

Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
@dlorenc
Copy link
Contributor Author

dlorenc commented Sep 7, 2023

Ah whoops - I actually didn't intend for go to add the 1.21 stuff, that was a side effect of me using 1.21 to perform the change myself I think. Feel free to separate that part out if that helps.

@spiffcs
Copy link
Contributor

spiffcs commented Sep 7, 2023

No worries - so far it's not too big of a lift. If I run into complications I'll be sure to separate this out as it's own separate thing to make sure it get's resolved and is not blocked by the update

@spiffcs spiffcs merged commit 9f22ab6 into anchore:main Sep 7, 2023
9 checks passed
spiffcs added a commit that referenced this pull request Sep 7, 2023
* main:
  Bump the golang.org/x/exp dependency and fix a build breakage. (#2088)
  chore(deps): bump actions/checkout from 3 to 4 (#2094)
  chore(deps): bump github.com/gkampitakis/go-snaps from 0.4.7 to 0.4.10 (#2106)

Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
@kashw2 kashw2 mentioned this pull request Sep 14, 2023
12 tasks
GijsCalis pushed a commit to GijsCalis/syft that referenced this pull request Feb 19, 2024
…re#2088)

* Bump the golang.org/x/exp dependency and fix a build breakage.

---------

Signed-off-by: Dan Lorenc <dlorenc@chainguard.dev>
Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
Co-authored-by: Christopher Phillips <christopher.phillips@anchore.com>
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