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.

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

fix(build): packaged openssl files #2935

Merged
merged 5 commits into from
Feb 22, 2023
Merged

Conversation

elecpower
Copy link
Collaborator

@elecpower elecpower commented Dec 23, 2022

Fixes #2929 #2758

Summary of changes:

  • modify the github workflows including installing Qt tools openssl for each OS
  • change the Companion installer processes to bundle the Qt versions of the openssl libs

Dependencies:
For linux builds EdgeTX/build-edgetx#14 needs to be merged

TODO:

  • Win x86
  • Win x64
  • linux
  • MacOS

@elecpower elecpower changed the title cpn(fix): packaged openssl files fix(build): packaged openssl files Dec 23, 2022
@pfeerick pfeerick marked this pull request as draft December 24, 2022 02:05
@pfeerick pfeerick added bug 🪲 Something isn't working companion Related to the companion software labels Dec 24, 2022
@elecpower elecpower force-pushed the elecpower/cpn-fix-2929-ssl-libs branch from 3272354 to f362cc2 Compare January 3, 2023 22:56
@elecpower
Copy link
Collaborator Author

@pfeerick I've tested the installer in MSYS2 x64 and Ubuntu 20.04 with a slightly modified build-edgetx Dockerfile. MacOS is a mystery to me so help here would be appreciated.

Note: When this is merged various Wiki pages and associated scripts will require changes.

@elecpower
Copy link
Collaborator Author

Qt does not have an OpenSSL tools package for MacOS. So need to install version 1.1.1 from another source and bundle that in.
eg https://franz.com/support/documentation/current/doc/installation.htm#macosx-ssl-install-2

@pfeerick pfeerick self-assigned this Jan 17, 2023
@pfeerick pfeerick marked this pull request as ready for review January 17, 2023 05:30
@pfeerick
Copy link
Member

pfeerick commented Feb 2, 2023

As much as I detest touching build-edgetx for a minor version release, is this something you think we need for 2.8.1?

@pfeerick pfeerick added this to the 2.9 milestone Feb 22, 2023
@pfeerick pfeerick merged commit cbec97d into main Feb 22, 2023
@pfeerick pfeerick deleted the elecpower/cpn-fix-2929-ssl-libs branch February 22, 2023 06:58
pfeerick pushed a commit that referenced this pull request May 15, 2023
* Fix packaged win 32 bit openssl file names

* Win install openssl from qt tools

* Fix filters and paths

* Fix github workflow for x64

* Remove export from run
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug 🪲 Something isn't working companion Related to the companion software
Projects
None yet
2 participants