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.4.2 into main #5101

Merged
merged 15 commits into from
Oct 8, 2024
Merged

chore(merge): 8.4.2 into main #5101

merged 15 commits into from
Oct 8, 2024

Conversation

mr-cal
Copy link
Collaborator

@mr-cal mr-cal commented Oct 7, 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.4.2 into main.

After this lands, I will merge 7.5.7 into main.

mr-cal and others added 15 commits September 30, 2024 19:16
Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
Fixes a bug where the remote builder would ignore the user and always
clean the launchpad project.

Also drops some magic values in favor of constants.

Fixes #4929

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
Signed-off-by: Dariusz Duda <dariusz.duda@canonical.com>
Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
Rename legacy variables to match snapd's definition:
snap_name->snap_instance_name (possibly aliased)
snap_store_name->snap_name (unaliased)

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
@mr-cal mr-cal added the merge label Oct 7, 2024
@mr-cal mr-cal requested a review from a team October 7, 2024 22:17
@lengau lengau requested a review from a team October 8, 2024 00:42
@mr-cal mr-cal merged commit 82fa41a into main Oct 8, 2024
13 checks passed
@mr-cal mr-cal deleted the merge/8.4.2 branch October 8, 2024 16:12
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