Skip to content

Fix Qt4 removal from MSYS2 packages - #954

Merged
guitorri merged 3 commits into
Qucs:developfrom
in3otd:fix_appveyor
Feb 3, 2020
Merged

Fix Qt4 removal from MSYS2 packages#954
guitorri merged 3 commits into
Qucs:developfrom
in3otd:fix_appveyor

Conversation

@in3otd

@in3otd in3otd commented Feb 2, 2020

Copy link
Copy Markdown
Contributor

...trying a "fix" from here.

@in3otd

in3otd commented Feb 2, 2020

Copy link
Copy Markdown
Contributor Author

Just noticed that the Appveyor docs say that "By default, saving cache is disabled in Pull Request builds.", so it seems we need to have this merged before having a valid cache.

@in3otd

in3otd commented Feb 2, 2020

Copy link
Copy Markdown
Contributor Author

ok, it seems to work.
Someone please press the Merge button - or I'll do that later 😁.
Not sure this should go to master now, as there are other small things that should be merged in develop, so maybe we can merge develop into master later.

@in3otd in3otd changed the title [WIP] Fix Qt4 removal from MSYS2 packages Fix Qt4 removal from MSYS2 packages Feb 2, 2020
@guitorri

guitorri commented Feb 3, 2020

Copy link
Copy Markdown
Member

Only releases branches should merge back into master.
I will give another try on finishing off release 20.

@guitorri
guitorri merged commit 7bec481 into Qucs:develop Feb 3, 2020
@in3otd

in3otd commented Feb 3, 2020

Copy link
Copy Markdown
Contributor Author

thanks.
yes, but I wonder(ed) if also #953 and #951 (and #946, assuming I'll be able to finish it soon) should be included in 0.0.20.

I was also taking a look at how to do the release, cross-compiling for Windows in Linux - but I'll need quite some time to set up everything and I'm not sure I'll be able to make it work.

@guitorri

guitorri commented Feb 3, 2020

Copy link
Copy Markdown
Member

Sure, tag them for 20. After they are in, we release it.

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