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

feat: support multiple components #85

Merged

Conversation

jjmaestro
Copy link
Contributor

Add support for multiple sources.list components (e.g. "main contrib").

Before, all of the components were being parsed as one string which resulted in _fetch_package_index() failing.

See https://wiki.debian.org/SourcesList#sources.list_format and https://wiki.debian.org/DebianRepository/Format#Components.

Note

This PR is stacked on top of #84, please review / comments for the first two commits in there.

The 'ci: update ci and exclude windows' commit added
'target_compatible_with' arguments to some of the tests restricting them
to linux but it also forced amd64 instead of allowing the tests to run
in both linux/amd64 and linux/arm64.

Before this fix, I would get SKIPPED tests when testing on linux/arm64
and now all the tests run.
Just doing 'bazel run' on the locks (except apt_security which is
lock-less) and runnign the tests for linux/amd64 and linux/arm64:

```
bazel run @bullseye//:lock
bazel run @shared_dependencies//:lock
bazel run @noble//:lock

bazel test //...
```

produces these changes, which seem to be, mostly,

* tabs vs 2 spaces in lock.json
* keys with '_' instead of '~'
* some tooling in MODULES.lock
Add support for multiple sources.list components (e.g. "main contrib").

Before, all of the components were being parsed as one string which
resulted in _fetch_package_index() failing.

See https://wiki.debian.org/SourcesList#sources.list_format and
https://wiki.debian.org/DebianRepository/Format#Components
Copy link
Collaborator

@thesayyn thesayyn left a comment

Choose a reason for hiding this comment

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

LGTM, lets rebase once #84 lands

@thesayyn thesayyn merged commit 2ce7b47 into GoogleContainerTools:main Sep 12, 2024
10 checks passed
@jjmaestro jjmaestro deleted the feat-support-multiple-components branch September 12, 2024 22:31
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