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

Revert "chore: explicity set cargo feature resolver version to 2" #3376

Merged
merged 1 commit into from
Aug 30, 2023

Conversation

etungsten
Copy link
Contributor

cargo make build-package breaks due to this change. This needs re-evaluating.
This reverts commit 3a4dadc.

Issue number:
#3372

Description of changes:

    Revert "chore: explicity set cargo feature resolver version to 2"
    
    `cargo make build-package` breaks due to this change. This needs
    re-evaluating.
    This reverts commit 3a4dadc3c9e10a2ed2eac76377c1643bb71a29c5.

Testing done:
cargo make build-package works:

[cargo-make][1] INFO - Running Task: build-package                                                                                                                                                                 
   Compiling glibc v0.1.0 (/home/fedora/bottlerocket/packages/glibc)                                                                                                                                               
   Compiling os v0.1.0 (/home/fedora/bottlerocket/packages/os)                                                                                                                                                     
    Finished dev [optimized] target(s) in 3m 38s                                                                                                                                                                   
[cargo-make][1] INFO - Build Done in 294.04 seconds.                                                     
[cargo-make] INFO - Build Done in 294.54 seconds.    

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

`cargo make build-package` breaks due to this change. This needs
re-evaluating.
This reverts commit 3a4dadc.
Copy link
Contributor

@foersleo foersleo left a comment

Choose a reason for hiding this comment

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

I think for the time being reverting this is the right decision. Looking at the analysis Markus did on the ticket I raised it seems making this work with resolver 2 may be a bigger effort.

Copy link
Contributor

@stmcginnis stmcginnis left a comment

Choose a reason for hiding this comment

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

I agree. This is just a warning with the newer toolchain, so it's not that big of a deal. We will likely need to sort it out before that warning becomes an error, but I would assume we have some time before that is a possibility.

@markusboehme
Copy link
Member

I was hoping someone would have a quick idea, but reverting works for now, too. Thanks!

@etungsten etungsten merged commit e8b58a0 into bottlerocket-os:develop Aug 30, 2023
42 checks passed
@etungsten etungsten deleted the revert-resolver branch August 30, 2023 16:17
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