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(merge): '8.2.12' into 'main' #4872

Merged
merged 8 commits into from
Jun 27, 2024
Merged

chore(merge): '8.2.12' into 'main' #4872

merged 8 commits into from
Jun 27, 2024

Conversation

mr-cal
Copy link
Collaborator

@mr-cal mr-cal commented Jun 24, 2024

  • Have you followed the guidelines for contributing?
  • Have you signed the CLA?
  • Have you successfully run tox run -m lint?
  • Have you successfully run tox run -e test-py310? (supported versions: py39, py310, py311, py312)

Merge 8.2.12 into main

Needs a new craft-parts 1.32.0 release (canonical/craft-parts#762)

tigarmo and others added 6 commits June 19, 2024 14:22
Readthedocs builds don't fetch tags when cloning the repo. This is a
problem for us because Snapcraft's version comes from the git tag, so do
a fetch of the tags as a post-checkout step.

Additionally, explicitly install snapcraft itself (via "pip install .")
so that the code that gets the version from git actually runs. Note that
this already works on "latest" because that builds off of "main" where
this fix has already been applied (when moving to canonical-sphinx).
Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
When raised they show up as a Snapcraft internal error if not properly
handled.

This is using the same logic as in legacy.

Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
@mr-cal mr-cal requested review from tigarmo and a team and removed request for a team and tigarmo June 24, 2024 13:24
@sergiusens sergiusens requested a review from tigarmo June 24, 2024 18:28
@mr-cal mr-cal added the merge label Jun 24, 2024
.readthedocs.yaml Show resolved Hide resolved
Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
@mr-cal mr-cal merged commit d379de3 into main Jun 27, 2024
9 of 10 checks passed
@mr-cal mr-cal deleted the merge/8.2.12 branch June 27, 2024 14:35
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.

3 participants