piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(cpn): Include openssl files in install packages (#2935)

Browse Source 
* 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
This commit is contained in:
Neil Horne
2023-02-22 16:57:58 +10:00
committed by GitHub
parent 3c9fab0e8f
commit cbec97d76e
3 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/win-cpn-32.yml
+3 -2
View File
@@ -56,8 +56,7 @@ jobs:
mingw-w64-i686-libraqm \
mingw-w64-i686-SDL \
mingw-w64-i686-clang \
mingw-w64-i686-nsis \
mingw-w64-i686-openssl
mingw-w64-i686-nsis
python -m pip install clang
- name: Install Qt
@@ -67,6 +66,7 @@ jobs:
cache-key-prefix: 'install-qt-action-win32'
version: ${{ env.QT_VERSION }}
arch: ${{ env.MINGW_VERSION }}
tools: 'tools_openssl_x86'
- name: Check out the repo
uses: actions/checkout@v3
@@ -79,6 +79,7 @@ jobs:
run: |
mkdir output && \
CMAKE_PREFIX_PATH=$RUNNER_WORKSPACE/Qt/$QT_VERSION/$MINGW_PATH \
QT_TOOLS_OPENSSL_ROOT_PATH=$RUNNER_WORKSPACE/Qt/Tools/OpenSSL/Win_x86 \
tools/build-companion.sh "$(pwd)" "$(pwd)/output/"
- name: Compose release filename
# https://stackoverflow.com/questions/58033366/how-to-get-current-branch-within-github-actions
.github/workflows/win_cpn-64.yml
+3 -2
View File
@@ -70,8 +70,7 @@ jobs:
mingw-w64-x86_64-libraqm \
mingw-w64-x86_64-SDL \
mingw-w64-x86_64-clang \
mingw-w64-x86_64-nsis \
mingw-w64-x86_64-openssl
mingw-w64-x86_64-nsis
python -m pip install clang
- name: Install Qt
@@ -81,6 +80,7 @@ jobs:
cache-key-prefix: 'install-qt-action-win64'
version: ${{ env.QT_VERSION }}
arch: ${{ env.MINGW_VERSION }}
tools: 'tools_openssl_x64'
- name: Check out the repo
uses: actions/checkout@v3
@@ -93,6 +93,7 @@ jobs:
run: |
mkdir output && \
CMAKE_PREFIX_PATH=$RUNNER_WORKSPACE/Qt/$QT_VERSION/$MINGW_PATH \
QT_TOOLS_OPENSSL_ROOT_PATH=$RUNNER_WORKSPACE/Qt/Tools/OpenSSL/Win_x64 \
tools/build-companion.sh "$(pwd)" "$(pwd)/output/"
- name: Compose release filename