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): work/merge-8.3-8.4 into main #5044

Merged
merged 8 commits into from
Sep 18, 2024
Merged

chore(merge): work/merge-8.3-8.4 into main #5044

merged 8 commits into from
Sep 18, 2024

Conversation

tigarmo
Copy link
Contributor

@tigarmo tigarmo commented Sep 16, 2024

This merge PR was built by:

  • Creating a clean branch off of main;
  • Merging hotfix/8.3;
  • Merging hotfix/8.4.

No other alterations were needed.

mr-cal and others added 5 commits September 13, 2024 11:10
Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
- [ ] Have you followed the [guidelines for
contributing](https://github.com/snapcore/snapcraft/blob/master/CONTRIBUTING.md)?
- [ ] Have you signed the
[CLA](http://www.ubuntu.com/legal/contributors/)?
- [ ] Have you successfully run `tox run -m lint`?
- [ ] Have you successfully run `tox run -e test-py310`? (supported
versions: `py39`, `py310`, `py311`, `py312`)

-----
…5043)

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
@tigarmo tigarmo closed this Sep 17, 2024
@tigarmo tigarmo reopened this Sep 17, 2024
@tigarmo tigarmo added the merge label Sep 17, 2024
@tigarmo tigarmo marked this pull request as ready for review September 17, 2024 12:14
@tigarmo tigarmo requested review from mr-cal and a team September 17, 2024 12:14
Copy link
Collaborator

@mr-cal mr-cal left a comment

Choose a reason for hiding this comment

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

Since hotfix/8.3 was created before we had a changelog, can you add an entry for 8.3.4 as part of this merge?

You can use this: https://github.com/canonical/snapcraft/pull/5037/files#diff-eb29f8aa8710b23f62787ed2d4a3049c01d0d1859b625b20a11e2b523e525694

@tigarmo
Copy link
Contributor Author

tigarmo commented Sep 17, 2024

@mr-cal done

@tigarmo tigarmo requested review from a team and mr-cal September 17, 2024 16:59
Copy link
Collaborator

@mr-cal mr-cal left a comment

Choose a reason for hiding this comment

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

Thanks!

@mr-cal mr-cal requested a review from a team September 17, 2024 18:06
@mr-cal
Copy link
Collaborator

mr-cal commented Sep 18, 2024

Re-merged and force-pushed because main was updated

@mr-cal mr-cal merged commit 62dacfb into main Sep 18, 2024
8 of 10 checks passed
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