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

chore(cpn): update to Qt 5.15.2 and rework application packaging (#4270)

Browse Source 
Co-authored-by: raphaelcoeffic <raphael.coeffic@frafos.com>
Co-authored-by: philmoz <phil.a.mitchell@gmail.com>
This commit is contained in:
Neil Horne
2023-11-10 15:12:28 +10:00
committed by GitHub
co-authored by raphaelcoeffic philmoz
parent 9d5c6e62cb
commit a3faf7e9df
49 changed files with 347 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/macosx_cpn.yml
+14 -14
View File
@@ -30,7 +30,7 @@ on:
env:
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
BUILD_TYPE: Release
QT_VERSION: "5.12.9"
QT_VERSION: "5.15.2"
jobs:
build:
@@ -71,27 +71,27 @@ jobs:
run: python3 -m pip install --upgrade pip Pillow lz4 clang jinja2
- name: Patch GitHub macOS build
run: brew install pkg-config
run: brew install pkg-config
- name: Install libusb
run: wget https://github.com/libusb/libusb/releases/download/v1.0.20/libusb-1.0.20.tar.bz2 &&
export MACOSX_DEPLOYMENT_TARGET=10.9 &&
tar xfv libusb-1.0.20.tar.bz2 &&
cd libusb-1.0.20 &&
./configure &&
make install &&
cd ..
run: brew install libusb
- name: Install dfu-util
run: wget https://downloads.sourceforge.net/project/dfu-util/dfu-util-0.9.tar.gz &&
tar xfv dfu-util-0.9.tar.gz &&
cd dfu-util-0.9 &&
./configure &&
make install
run: brew install dfu-util
- name: Select XCode version
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '13.2.1'
- name: Install SDL2
run: brew install SDL2
- name: Select XCode version
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '11.7'
- name: Build
working-directory: ${{github.workspace}}
shell: bash
.github/workflows/win-cpn-32.yml
+6 -6
View File
@@ -17,9 +17,9 @@ env:
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
BUILD_TYPE: Release
CMAKE_GENERATOR: "MSYS Makefiles"
QT_VERSION: "5.12.9"
MINGW_VERSION: "win32_mingw73"
MINGW_PATH: "mingw73_32"
QT_VERSION: "5.15.2"
MINGW_VERSION: "win32_mingw81"
MINGW_PATH: "mingw81_32"
jobs:
build:
@@ -56,7 +56,9 @@ jobs:
mingw-w64-i686-libraqm \
mingw-w64-i686-SDL2 \
mingw-w64-i686-clang \
mingw-w64-i686-nsis
mingw-w64-i686-nsis \
mingw-w64-i686-dfu-util \
mingw-w64-i686-openssl
python -m pip install clang jinja2
- name: Install Qt
@@ -66,7 +68,6 @@ 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,7 +80,6 @@ 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
+6 -6
View File
@@ -31,9 +31,9 @@ env:
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
BUILD_TYPE: Release
CMAKE_GENERATOR: "MSYS Makefiles"
QT_VERSION: "5.12.9"
MINGW_VERSION: "win64_mingw73"
MINGW_PATH: "mingw73_64"
QT_VERSION: "5.15.2"
MINGW_VERSION: "win64_mingw81"
MINGW_PATH: "mingw81_64"
jobs:
build:
@@ -70,7 +70,9 @@ jobs:
mingw-w64-x86_64-libraqm \
mingw-w64-x86_64-SDL2 \
mingw-w64-x86_64-clang \
mingw-w64-x86_64-nsis
mingw-w64-x86_64-nsis \
mingw-w64-x86_64-dfu-util \
mingw-w64-x86_64-openssl
python -m pip install clang jinja2
- name: Install Qt
@@ -80,7 +82,6 @@ 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,7 +94,6 @@ 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