- [X] Have you followed the [guidelines for contributing](https://github.com/snapcore/snapcraft/blob/master/CONTRIBUTING.md)? - [X] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)? - [x] Have you successfully run `./runtests.sh static`? - [X] Have you successfully run `./runtests.sh tests/unit`? ----- ## Overview Port all missing commits from `main` (snapcraft 6.x) to `snapcraft/7.0`. Last common ancestor was `b81550376` on 2021-Dec-03. ## Implementation ### 1. Get all merges to main since snapcraft/7.0 diverged `git log --first-parent --pretty="hash: %Cgreen%h%Creset action: cherry-pick|patch|skip%n%an %ad%n%B%n" --decorate=no origin/snapcraft/7.0..origin/main > commit-log.txt` ### 2. Choose action for each commit The above command found 30 merges to `main`. I looked at each commit, chose to cherry-pick, patch, or skip each commit, then updated the `action` field in the `commit-log.txt` file. Resulting data: ``` hash: 0224b48e action: skip Sergio Schvezov Fri Apr 1 09:53:11 2022 -0300 Merge pull request #3667 from jugmac00/patch-1 storeapi: fix typo hash: abfeb5a4 action: patch Sergio Schvezov Fri Mar 25 19:51:22 2022 -0300 Merge pull request #3542 from Blacksmoke16/crystal-v2-plugin plugins: add crystal v2 plugin hash: 4fa3a972 action: skip Sergio Schvezov Fri Mar 25 18:53:29 2022 -0300 Merge pull request #3670 from mr-cal/spread-fix-python-hello spread: fix python-hello hash: ce1c5584 action: patch Sergio Schvezov Fri Mar 18 18:37:58 2022 -0300 Merge pull request #3425 from jhenstridge/schema-dbus-activation schema: add support for activates-on app property to schema hash: 05081035 action: skip Sergio Schvezov Fri Mar 18 17:47:15 2022 -0300 Merge pull request #3490 from snapcore/dependabot/pip/pyyaml-5.4 build(deps): bump pyyaml from 5.3 to 5.4 hash: 1688d524 action: cherry-pick Sergio Schvezov Fri Mar 18 16:10:06 2022 -0300 Merge pull request #3664 from Guillaumebeuzeboc/ROBENG-147/source-subdir-not-used-by-ros-plugin-v2 ROS plugins v2: respect source-subdir key hash: 808d3b39 action: cherry-pick Sergio Schvezov Fri Mar 18 15:24:18 2022 -0300 Merge pull request #3607 from mhoeher/launchpad-bug-1956216 docker: fix python installation hash: 8e781888 action: cherry-pick Sergio Schvezov Fri Mar 18 12:33:02 2022 -0300 Merge pull request #3661 from lupino3/patch-2 gradle v1 plugin: add support for JDK 17 hash: fa2a76aa action: cherry-pick Sergio Schvezov Fri Mar 18 01:28:48 2022 -0300 Merge pull request #3595 from jriddell/work/kde-neon-compression-lzo kde extension: use lzo compression hash: 183fb9d9 action: cherry-pick Sergio Schvezov Thu Mar 17 23:22:01 2022 -0300 Merge pull request #3658 from jriddell/master switch to new kde-framework content snap hash: bcea8056 action: skip Sergio Schvezov Tue Mar 15 21:57:20 2022 -0300 Merge pull request #3663 from mr-cal/tests-update-spread-url tests: update spread url hash: a04646f1 action: cherry-pick Sergio Schvezov Thu Mar 3 11:54:45 2022 +0100 Merge pull request #3656 from nessita/update-staging-store-urls tools: update staging store URL for uploading blobs hash: 90598222 action: cherry-pick Sergio Schvezov Mon Feb 21 15:37:05 2022 -0300 Merge pull request #3648 from aritra24/reintroduce-help-options cli: reintroduce remote-build and promote to snapcraft help hash: ffdeed95 action: cherry-pick Sergio Schvezov Mon Feb 21 11:51:53 2022 -0300 Merge pull request #3638 from artivis/fix/colcon-cmake-args colcon v2: forward cmake args hash: 12d6ec6b action: cherry-pick Sergio Schvezov Mon Feb 21 09:44:55 2022 -0300 Merge pull request #3643 from snapcore/kde-compose-dead extension: compose and deadkeys for neon hash: 5011b01b action: cherry-pick Sergio Schvezov Fri Feb 18 15:14:05 2022 -0300 Merge pull request #3641 from snapcore/simplify-dep-prereq lifecycle: fix behavior for core22-step-dependencies (CRAFT-733) hash: 8e90fda0 action: cherry-pick Sergio Schvezov Tue Feb 15 11:51:54 2022 -0300 Merge pull request #3640 from snapcore/sergiusens-patch-1 spread: update error when local snap is missing hash: 7adb77a7 action: cherry-pick Sergio Schvezov Tue Feb 8 14:10:48 2022 -0300 Merge pull request #3634 from mr-cal/dependencies-library-resolution dependencies: missing library resolution (CRAFT-422) LP: #1934403 hash: 383c1f1c action: skip Sergio Schvezov Mon Feb 7 14:36:04 2022 -0300 Merge pull request #3629 from mr-cal/sources-make-submodule-fetching-configurable sources: make submodule fetching configurable hash: 7d89c7cf action: cherry-pick Sergio Schvezov Mon Feb 7 11:52:45 2022 -0300 Merge pull request #3628 from diddledani/fix-autogensh-crash Autotools Plugin (v1): Fix fatal crash when running autogen.sh or bootstrap hash: b4384541 action: cherry-pick Sergio Schvezov Mon Jan 24 08:54:55 2022 -0300 Merge pull request #3625 from om26er/npm-no-preserve npm plugin: extract node archive without preserving ownership hash: 52c6c7d9 action: cherry-pick Sergio Schvezov Mon Jan 17 11:37:05 2022 -0300 Merge pull request #3624 from om26er/fix-npm-root-install npm plugin: allow running as root hash: 2c438b0c action: patch Sergio Schvezov Thu Jan 13 12:19:51 2022 -0300 Merge pull request #3622 from snapcore/core20-pull-build-opt-in lifecycle: core22 lifecycle conditional on build-attributes entry (CRAFT-725) hash: 24420795 action: patch Sergio Schvezov Wed Jan 12 12:38:41 2022 -0300 Merge pull request #3620 from sergiusens/revert Revert "lifecycle: do not stage deps for pull on core20" hash: 22040ffc action: skip Sergio Schvezov Tue Jan 11 15:28:16 2022 -0300 Merge pull request #3617 from snapcore/no-refresh-installed snap: do not refresh already installed snaps hash: cf5bdcb5 action: skip Sergio Schvezov Tue Jan 11 11:57:54 2022 -0300 Merge pull request #3615 from snapcore/flutter-git spread: change uri for flutter's pubspec to https hash: 765a6fbf action: cherry-pick Sergio Schvezov Tue Jan 11 10:03:52 2022 -0300 Merge pull request #3611 from kenvandine/libdrm_layout extensions: add layout for libdrm hash: 4c78e535 action: skip Sergio Schvezov Mon Jan 10 22:15:59 2022 -0300 Merge pull request #3606 from snapcore/dependabot/pip/lxml-4.6.5 build(deps): bump lxml from 4.6.3 to 4.6.5 hash: bb816bef action: cherry-pick Sergio Schvezov Mon Jan 10 19:59:05 2022 -0300 Merge pull request #3598 from ppd/kde-neon-not-experimental extensions/kde-neon: declare non-experimental for core20 hash: 55fff7f6 action: patch Sergio Schvezov Mon Jan 10 09:09:13 2022 -0300 Merge pull request #3610 from snapcore/bugfix/pull-no-stage-core20 lifecycle: do not stage deps for pull on core20 (CRAFT-725) ``` Out of 30 commits, there are 18 that can be cherry-picked, 4 that need manual touch up to the patch file, and 8 that can be skipped. The skipped commits already exist in `snapcraft/7.0` or are not relevant (affected code no longer exists). ### 3. Prep and run git commands Convert the change log above into usable commands. For the patches, the changes I made were only `%s/snapcraft/snapcraft_legacy/gc` and `%s/tests\/unit/tests\/legacy\/unit/gc`. `tac commit-log.txt | sed -E '/action: (cherry-pick|patch)/!d; s/hash: ([[:alnum:]]+) action: cherry-pick/git cherry-pick --mainline=1 \1/g; s/hash: ([[:alnum:]]+) action: patch/git log -p --reverse --binary --pretty=email --stat -m --first-parent \1...\1~ > \1.patch\ngit am \1.patch/g' ` Resulting data: ``` git log -p --reverse --binary --pretty=email --stat -m --first-parent 55fff7f6...55fff7f6~ > 55fff7f6.patch git am 55fff7f6.patch git cherry-pick --mainline=1 bb816bef git cherry-pick --mainline=1 765a6fbf git log -p --reverse --binary --pretty=email --stat -m --first-parent 24420795...24420795~ > 24420795.patch git am 24420795.patch git log -p --reverse --binary --pretty=email --stat -m --first-parent 2c438b0c...2c438b0c~ > 2c438b0c.patch git am 2c438b0c.patch git cherry-pick --mainline=1 52c6c7d9 git cherry-pick --mainline=1 b4384541 git cherry-pick --mainline=1 7d89c7cf git cherry-pick --mainline=1 7adb77a7 git cherry-pick --mainline=1 8e90fda0 git cherry-pick --mainline=1 5011b01b git cherry-pick --mainline=1 12d6ec6b git cherry-pick --mainline=1 ffdeed95 git cherry-pick --mainline=1 90598222 git cherry-pick --mainline=1 a04646f1 git cherry-pick --mainline=1 183fb9d9 git cherry-pick --mainline=1 fa2a76aa git cherry-pick --mainline=1 8e781888 git cherry-pick --mainline=1 808d3b39 git cherry-pick --mainline=1 1688d524 git log -p --reverse --binary --pretty=email --stat -m --first-parent ce1c5584...ce1c5584~ > ce1c5584.patch git am ce1c5584.patch git log -p --reverse --binary --pretty=email --stat -m --first-parent abfeb5a4...abfeb5a4~ > abfeb5a4.patch git am abfeb5a4.patch ``` ### 4. Validate changes Manually validate between `main` and `snapcraft/7.0` by diffing `snapcraft/` and `snapcraft_legacy/`. Additionally, diff between `tests/` and `tests/legacy/`. The differences are all expected (i.e. references to `snapcraft_legacy` instead of `snapcraft`). (CRAFT-844)