ExanimaModding/Toolkit
5
4
Fork
You've already forked Toolkit
1

WIP: feat(installed): create an installer for emtk using nsis #50

Draft
Megumin wants to merge 1 commit from feat/installer into main
pull from: feat/installer
merge into: ExanimaModding:main
ExanimaModding:main
ExanimaModding:chore/rewrite-framework
ExanimaModding:feat/lua-rt
ExanimaModding:v0.1.0-beta
ExanimaModding:plugins
ExanimaModding:feat/launcher
ExanimaModding:feat/rdb
ExanimaModding:feat/rust-bindings
ExanimaModding:feat/egui-gui

TODO:

  • Set up CI to build the installer using makensis
  • Update CI to only add the installer and emf.dll.lib as artifacts (unzipped)
  • Add icon to emtk.exe
TODO: - [ ] Set up CI to build the installer using makensis - [ ] Update CI to only add the installer and emf.dll.lib as artifacts (unzipped) - [ ] Add icon to emtk.exe
This pull request has changes conflicting with the target branch.
  • crates/xtask/Cargo.toml
  • crates/xtask/src/main.rs
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feat/installer:feat/installer
git switch feat/installer

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff feat/installer
git switch feat/installer
git rebase main
git switch main
git merge --ff-only feat/installer
git switch feat/installer
git rebase main
git switch main
git merge --no-ff feat/installer
git switch main
git merge --squash feat/installer
git switch main
git merge --ff-only feat/installer
git switch main
git merge feat/installer
git push origin main
Sign in to join this conversation.
No reviewers
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
ExanimaModding/Toolkit!50
Reference in a new issue
ExanimaModding/Toolkit
No description provided.
Delete branch "feat/installer"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?