This repository has been archived by the owner on Jun 18, 2019. It is now read-only.
Visual update (again) #24
Merged
Conversation
This file contains 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
# Conflicts: # package.json
Rather than storing the state. This is much better since with this approach removing the mismatched share correctly updates everything that shares are now matched.
This is an unfortunate consequence of the current two-package.json setup that used to be required by electron-builder. Apparently recent versions are much smarter and do not require this setup. Would be great to get away from and merge our two package.jsons to avoid this and other complications.
Merged
This was referenced Jun 9, 2017
GabeIsman
approved these changes
Jun 9, 2017
|
😘 😎 |
conorsch
pushed a commit
that referenced
this pull request
Jun 9, 2017
The `icns2png` command was referencing the old path to the `app.icns` file, which is no longer valid as of #17 and #24. Fixing that command allows the icns -> png format conversion work as intended. No changes required to `package.json`, since the paths there are already correct. Closes #23. Signed-off-by: Conor Schaefer <conor@freedom.press>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Pulls in the changes originally presented via #17 in the
visual-updatebranch. Something went wrong with the merge of #16 and #17 together, i.e.visual-update->updated-rusty-secrets->master. The problem was surely caused by my manual resolution of conflicts.Noticed in #23 that we're not seeing the visual updates that we should be, and @garrettr pointed out that went awry with the merge.
In creating this branch, I re-merged
visual-updateintomasterand confirmed that the new assets display properly. All tests are passing locally on Mac. The Linux builds still create incomplete packages (#20), but incorporating changes from #22 in a disposable branch showed green lights across the board. Specifically (since we don't have CI), the testing story looks like:Mac:
npm run testpassesnpm run test-e2epassesnpm run distsucceedsLinux:
npm run testpassesnpm run test-e2efails (expected; we use a headless environment in linux for now)npm run distsucceedsSo it looks like if we merge this and also #22, we're back in business. Tagging @GabeIsman for re-review of the changes, in case I screwed up any of the conflict resolution.
Closes #23.