canonical / craft-archives

A library for handling archives/repositories in Craft applications
https://canonical-craft-archives.readthedocs-hosted.com
GNU Lesser General Public License v3.0
0 stars 7 forks source link

many: merge starbase/main #74

Closed tigarmo closed 1 year ago

tigarmo commented 1 year ago

The commit list is huge because this is bringing in the entirety of starbase/main; I think the important commits to look at are the last merge, done by me (most conflicts were solved by using the starbase version), and the handful of commits after that fixing linting issues.

codecov[bot] commented 1 year ago

Codecov Report

Merging #74 (b23d3b3) into main (8874ce8) will not change coverage. The diff coverage is n/a.

@@           Coverage Diff           @@
##             main      #74   +/-   ##
=======================================
  Coverage   88.09%   88.09%           
=======================================
  Files          13       13           
  Lines         630      630           
  Branches      125      125           
=======================================
  Hits          555      555           
  Misses         61       61           
  Partials       14       14           
tigarmo commented 1 year ago

Leaving this as a Draft so we don't squash-merge by accident (needs to be a regular merge)

lengau commented 1 year ago

Thanks for doing the heavy lifting for this! It looks great!

tigarmo commented 1 year ago

It was actually surprisingly easy! About 15 minutes or so resolving the conflicts, and that's a price we'll only have to pay once (that's the hope anyway)

lengau commented 1 year ago

Oh good, in that case you can do this for snapcraft ;-)