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

ci: specify specific bolero dependency rather than workspace dependency #2424

Merged
merged 2 commits into from
Dec 13, 2024

Conversation

boquan-fang
Copy link
Contributor

@boquan-fang boquan-fang commented Dec 13, 2024

Description of changes:

Dependabot for s2n-quic is currently down with this error message. I checked the dependabot update log and found this error message:

updater | 2024/12/11 20:45:13 INFO <job_931351966> Handled error whilst updating rbpf: 
dependency_file_not_resolvable {:message=>"info: syncing channel updates for '1.80.0-x86_64-unknown-linux-
gnu'\ninfo: latest update on 2024-07-25, rust version 1.80.0 (051478957 2024-07-21)\ninfo: downloading component 
'cargo'\ninfo: downloading component 'clippy'\ninfo: downloading component 'rust-docs'\ninfo: downloading component 
'rust-std'\ninfo: downloading component 'rustc'\ninfo: downloading component 'rustfmt'\ninfo: installing component 
'cargo'\ninfo: installing component 'clippy'\ninfo: installing component 'rust-docs'\ninfo: installing component 'rust-
std'\ninfo: installing component 'rustc'\ninfo: installing component 'rustfmt'\nerror: failed to load manifest for workspace 
member `dependabot_tmp_dir/tools/xdp/s2n-quic-xdp`\nreferenced by workspace at 
`dependabot_tmp_dir/tools/xdp/Cargo.toml`\n\nCaused by:\n  failed to load manifest for dependency `s2n-
codec`\n\nCaused by:\n  failed to parse manifest at `dependabot_tmp_dir/common/s2n-codec/Cargo.toml`\n\nCaused 
by:\n  error inheriting `bolero-generator` from workspace root manifest's `workspace.dependencies.bolero-
generator`\n\nCaused by:\n  failed to find a workspace root"}

Seems like the Dependabot can't resolve dependency that we are currently doing in s2n-quic:

s2n-quic/Cargo.toml

Lines 18 to 20 in 5dd0c47

[workspace.dependencies]
bolero = "0.12"
bolero-generator = { version = "0.12", default-features = false }

[dev-dependencies]
bolero.workspace = true
futures-test = "0.3" # For testing Waker interactions

This problem is also mentioned in Dependabot-core repo:
They to implement features to support workspace in dependabot, but later reverted the change due to regression: dependabot/dependabot-core#10550 (comment).

They then try to reimplement such feature, but hasn't merge it: dependabot/dependabot-core#10629.

We do want to use workspace for this library in the future as mentioned in a previous PR#2400. However, we want to fix dependabot for now.

Therefore, this PR remove workspace in Cargo.toml and ping version 0.12 for bolero dependency. We believe such change could potentially fix our dependabot.

Call-outs:

  • This PR can only be tested after merge. Dependabot should be triggered again on this PR is merge, and we will see whether this fix it or not. If not, then we need to revert this change and investigate other causes and solutions.

  • We can still use workspace dependency if the dependabot team merge their PR.

Testing:

Merge this PR to test dependabot.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@boquan-fang boquan-fang marked this pull request as ready for review December 13, 2024 22:34
@boquan-fang boquan-fang changed the title fix(dependabot): ping bolero version to fix dependabot fix(dependabot): Specify specific bolero dependency rather than workspace dependency Dec 13, 2024
@boquan-fang boquan-fang changed the title fix(dependabot): Specify specific bolero dependency rather than workspace dependency CI: Specify specific bolero dependency rather than workspace dependency Dec 13, 2024
@WesleyRosenblum WesleyRosenblum changed the title CI: Specify specific bolero dependency rather than workspace dependency ci: specify specific bolero dependency rather than workspace dependency Dec 13, 2024
* add default-features=false to bolero-generator
@boquan-fang boquan-fang merged commit 1d2aaa7 into aws:main Dec 13, 2024
121 checks passed
@boquan-fang boquan-fang deleted the bolero-dependabot-fix branch December 19, 2024 17:49
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