Fix build, cherry-pick commit to build on arm, update depends, and update theme-switcher#73
Draft
ids1024 wants to merge 4 commits intomaster_hirsutefrom
Draft
Fix build, cherry-pick commit to build on arm, update depends, and update theme-switcher#73ids1024 wants to merge 4 commits intomaster_hirsutefrom
ids1024 wants to merge 4 commits intomaster_hirsutefrom
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
It seems #58 and #59 conflicted, breaking the build. This fixes that. It also update dependencies and doesn't reference non-existent branches. Superseding #67 and fixing #68.
We haven't ended up really changing anything here in impish, so having separate branches complicates things. So my plan is to delete
master_impish, add placeholderbionicandfocalbranches, and renamemaster_hirsuteto justmaster. So I've cherry-picked the commit to build on arm frommaster_impish.This has a commit to test the change from pop-os/theme-switcher#29.
Test but DO NOT merge. When pop-os/theme-switcher#29 is merged, the last commit should be removed and
cargo updateshould be run again. (Plus the branch changes.)