Skip to content

Automated build2#19

Merged
ann0see merged 17 commits intoann0see:AndroidBuildfrom
nefarius2001:automated_build2
Jan 18, 2021
Merged

Automated build2#19
ann0see merged 17 commits intoann0see:AndroidBuildfrom
nefarius2001:automated_build2

Conversation

@nefarius2001
Copy link
Copy Markdown

Do you understand whats wrong here?

@ann0see
Copy link
Copy Markdown
Owner

ann0see commented Jan 18, 2021

Puh. I didn't get that you opened this PR to my repo.

I cdon't understand it yet, but you must keep in mind that the windows build depends on the content of the improve_win_ci branch

@nefarius2001
Copy link
Copy Markdown
Author

does the request point to the newest commit of my branch(732f984)?

@ann0see
Copy link
Copy Markdown
Owner

ann0see commented Jan 18, 2021

I think so. Can you merge the content of my repo (enableWinBuild branch) in a branch on your repo, and merge the new windows installer (improve_win_ci branch on corrados repo)? This might allow you to have a working build for Windows and android

@ann0see
Copy link
Copy Markdown
Owner

ann0see commented Jan 18, 2021

I am 99% sure that this will work once jamulussoftware#841 is merged

@ann0see
Copy link
Copy Markdown
Owner

ann0see commented Jan 18, 2021

Can you merge corrados/master into your branch now?

@ann0see ann0see changed the base branch from EnableWinBuild to AndroidBuild January 18, 2021 13:07
@ann0see
Copy link
Copy Markdown
Owner

ann0see commented Jan 18, 2021

Let's have a look at it. I will merge it into a branch which is up to date with the current corrados master

@ann0see ann0see merged commit 5e04ea0 into ann0see:AndroidBuild Jan 18, 2021
@ann0see
Copy link
Copy Markdown
Owner

ann0see commented Jan 18, 2021

I think it works now?

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.

2 participants