Skip to content

Merging master back into develop.#142

Merged
clockworkgr merged 2 commits intodevelopfrom
master
Oct 21, 2019
Merged

Merging master back into develop.#142
clockworkgr merged 2 commits intodevelopfrom
master

Conversation

@clockworkgr
Copy link
Member

Major refactor squashed commits for clarity.

Fix more node bugs and application menu
…ectron-builder (#141)

- Major scaffolding framework change
- Ditched electron-forge/electron 2/electron-compile
- Moved to electron-builder setup w/ Webpack @electron 3
- Few cosmetic changes.
- Refactored appveyor and travis build scripts

Notes: Deployment is now handled via commit messages

To deploy a new release, commit with message starting with [Release].
Ensure that version has been bumped in package.json.
Tag will be vX.Y.Z

To deploy a new RC, commit with message starting with [RC].
Tag will be vX.Y.Z-RC-{commit_id}

To deploy a new one-off test release, commit with message starting with [Test].
Tag will be vX.Y.Z-dev-{commit_id}
@clockworkgr clockworkgr merged commit 2a0a891 into develop Oct 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant