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

chore(release): merge 3.3.2 to main #2121

Merged
merged 8 commits into from
Jan 27, 2025
Merged

chore(release): merge 3.3.2 to main #2121

merged 8 commits into from
Jan 27, 2025

Conversation

lengau
Copy link
Collaborator

@lengau lengau commented Jan 27, 2025

This merges all the bugfixes from the 3.3 branch to main.

mr-cal and others added 8 commits January 17, 2025 21:21
Adds
[reference](https://canonical-charmcraft--2080.com.readthedocs.build/en/2080/reference/platforms/)
and
[how-to](https://canonical-charmcraft--2080.com.readthedocs.build/en/2080/howto/build-guides/platforms/)
documentation for platforms, bases, and architectures in Charmcraft,
including information on the new [multi-base
support](#2054).


Fixes #2009
(CRAFT-3720)

---------

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
Co-authored-by: Alex Lowe <alex.lowe@canonical.com>
This is a partial for #2090, containing only what is currently in rST on
main. Once #2083 is merged we can do the rest.

I've also made a few tweaks to formatting related to those links

---------

Co-authored-by: Michael DuBelko <michael.dubelko@gmail.com>
This takes care of the edge case where you want to re-publish the same
library version with the same content. In this case we don't create a
new revision on the store, but we also don't cause an error.

Fixes #1981

---------

Co-authored-by: Michael DuBelko <michael.dubelko@gmail.com>
Minor updates to the platforms reference based on
[comments](#2080 (review))
in #2080.

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
The test command is experimental and was not intended to reach stable
releases. Place a notice on command help and execution. This command
will be removed and replaced by the final implementation that will
exist in craft-application.

Signed-off-by: Claudio Matsuoka <claudio.matsuoka@canonical.com>
The init command will not create spread templates. This was an
experimental feature not intended for general consumption, and
will be replaced by proper testing support implemented in
craft-application.

Existing spread files created from the templates won't be affected
and will remain working.

---------

Signed-off-by: Claudio Matsuoka <claudio.matsuoka@canonical.com>
@lengau lengau added the merge label Jan 27, 2025
@lengau lengau requested a review from a team January 27, 2025 18:48
@lengau lengau requested a review from medubelko as a code owner January 27, 2025 18:48
@medubelko medubelko removed their request for review January 27, 2025 18:56
@lengau lengau changed the title chore: merge 3.3.2 to main chore(release): merge 3.3.2 to main Jan 27, 2025
@mr-cal mr-cal requested a review from a team January 27, 2025 19:22
@lengau lengau merged commit 0760303 into main Jan 27, 2025
28 checks passed
@lengau lengau deleted the hotfix-merge/3.3.2 branch January 27, 2025 20:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants