Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Apply changes from #81 to the develop branch #83

Closed
stdevPavelmc opened this issue Dec 12, 2019 · 1 comment
Closed

Apply changes from #81 to the develop branch #83

stdevPavelmc opened this issue Dec 12, 2019 · 1 comment
Assignees
@stdevPavelmc
Labels
bug Something isn't working

Comments

@stdevPavelmc
Copy link
Contributor

stdevPavelmc commented Dec 12, 2019 •
edited
Loading

The problem

The default branch on this repo is develop, but in issue #82 we merged some changes on master and that changes had to be merged in develop; fibercrypto/skywallet-mcu is using this repo as a submodule, bun on the develop branch, that's the origin of the issue #81, to aid on the fix fibercrypto/skywallet-mcu#342 but on PR #82 the changes was applied to master instead of develop

Possible Solution

Port the changes applied in #82 to the develop branch
@stdevPavelmc stdevPavelmc added the bug Something isn't working label Dec 12, 2019
@stdevPavelmc stdevPavelmc self-assigned this Dec 12, 2019
stdevPavelmc added a commit to stdevPavelmc/skywallet-protob that referenced this issue Dec 13, 2019
@stdevPavelmc
Refs fibercrypto#83, force Python3 for all the steps of the build
c8586fc
@stdevPavelmc stdevPavelmc mentioned this issue Dec 13, 2019
Merged
stdevPavelmc added a commit to stdevPavelmc/skywallet-protob that referenced this issue Dec 13, 2019
@stdevPavelmc
Refs fibercrypto#83, Add Windows Os detection via MSYS2 and create th…
17cc922 
…e protob.exe target
stdevPavelmc added a commit to stdevPavelmc/skywallet-protob that referenced this issue Dec 13, 2019
@stdevPavelmc
Refs fibercrypto#83, update phony targets
ca9cbc9
stdevPavelmc added a commit to stdevPavelmc/skywallet-protob that referenced this issue Dec 13, 2019
@stdevPavelmc
Refs fibercrypto#83, add protob.exe cleanup on clean-c
1cede62
stdevPavelmc added a commit to stdevPavelmc/skywallet-protob that referenced this issue Dec 13, 2019
@stdevPavelmc
Refs fibercrypto#83, fix the real unix like target and add sudo to re…
e2a2b3c 
…move the protoc binary
@olemis
Copy link
Collaborator

olemis commented Dec 13, 2019

fixed in 81be0e9

@olemis olemis closed this as completed Dec 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@stdevPavelmc stdevPavelmc

Labels
bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@olemis @stdevPavelmc