chore: merge hotfix/2.7 into main #1742
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The `config.options` section of `charmcraft.yaml` supports, from Juju 3.1, a type `secret` (this is currently missing from the documentation, but the Juju team are addressing that now). This adds support for that, so that Charmcraft 2.5 can be used to pack charms that make use of this functionality.
This bumps only craft-providers and craft-store to match the minor versions used by snapcraft 7.x
Allows Charmcraft 2.7+ to use skopeo urls directly when uploading an oci-image resource. Example: ``` $ charmcraft upload-resource lengau-test-charm example-image --image docker://ghcr.io/canonical/charmed-mysql:8.0.36-22.04_edge Image not found locally. Passing path directly to skopeo. Revision 6 created of resource 'example-image' for charm 'lengau-test-charm'. $ ```
This reduces the chances of having pip install binary packages as indirect dependencies. Partial fix for #1473
lengau
force-pushed
the
hotfix-merge/2.7
branch
2 times, most recently
from
dd9d9cf to
ba0248c
Compare
dariuszd21
approved these changes
Jul 18, 2024
mattculler
approved these changes
Jul 19, 2024
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Brings 2.7.0 and 2.7.1 into main.
Most notably, brings #1740 to main.