mirror of
https://github.com/opentx/opentx.git
synced 2025-07-13 19:40:20 +03:00
Issue with SSL
This commit is contained in:
parent
58a3e9390f
commit
032cd5c5d1
1 changed files with 30 additions and 28 deletions
58
.github/workflows/nightly-companion-windows.yml
vendored
58
.github/workflows/nightly-companion-windows.yml
vendored
|
@ -12,9 +12,9 @@ env:
|
||||||
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
|
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
|
||||||
BUILD_TYPE: Release
|
BUILD_TYPE: Release
|
||||||
CMAKE_GENERATOR: "MSYS Makefiles"
|
CMAKE_GENERATOR: "MSYS Makefiles"
|
||||||
QT_VERSION: "5.12.9"
|
QT_VERSION: "5.15.2"
|
||||||
MINGW_VERSION: "win64_mingw73"
|
MINGW_VERSION: "win32_mingw81"
|
||||||
MINGW_PATH: "mingw73_64"
|
MINGW_PATH: "mingw81_32"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
|
@ -30,47 +30,48 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
- uses: msys2/setup-msys2@v2
|
- uses: msys2/setup-msys2@v2
|
||||||
with:
|
with:
|
||||||
msystem: MINGW64
|
msystem: MINGW32
|
||||||
update: true
|
update: true
|
||||||
install: git make
|
install: git make
|
||||||
|
|
||||||
- name: Install GCC 11.2
|
- name: Install GCC 11.2
|
||||||
run: |
|
run: |
|
||||||
wget https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libs-11.2.0-10-any.pkg.tar.zst
|
wget https://repo.msys2.org/mingw/mingw32/mingw-w64-i686-gcc-libs-11.2.0-10-any.pkg.tar.zst
|
||||||
wget https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-11.2.0-10-any.pkg.tar.zst
|
wget https://repo.msys2.org/mingw/mingw32/mingw-w64-i686-gcc-11.2.0-10-any.pkg.tar.zst
|
||||||
wget https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-crt-git-9.0.0.6448.b03cbfb95-1-any.pkg.tar.zst
|
wget https://repo.msys2.org/mingw/mingw32/mingw-w64-i686-crt-git-9.0.0.6448.b03cbfb95-1-any.pkg.tar.zst
|
||||||
pacman -U --noconfirm mingw-w64-x86_64-gcc-libs-11.2.0-10-any.pkg.tar.zst \
|
pacman -U --noconfirm mingw-w64-i686-gcc-libs-11.2.0-10-any.pkg.tar.zst \
|
||||||
mingw-w64-x86_64-gcc-11.2.0-10-any.pkg.tar.zst \
|
mingw-w64-i686-gcc-11.2.0-10-any.pkg.tar.zst \
|
||||||
mingw-w64-x86_64-crt-git-9.0.0.6448.b03cbfb95-1-any.pkg.tar.zst
|
mingw-w64-i686-crt-git-9.0.0.6448.b03cbfb95-1-any.pkg.tar.zst
|
||||||
|
|
||||||
- name: Install Dependencies
|
- name: Install Dependencies
|
||||||
run: |
|
run: |
|
||||||
pacman -S --noconfirm mingw-w64-x86_64-cmake \
|
pacman -S --noconfirm mingw-w64-i686-cmake \
|
||||||
mingw-w64-x86_64-python-pip \
|
mingw-w64-i686-python-pip \
|
||||||
mingw-w64-x86_64-python-pillow \
|
mingw-w64-i686-python-pillow \
|
||||||
mingw-w64-x86_64-python-lz4 \
|
mingw-w64-i686-python-lz4 \
|
||||||
mingw-w64-x86_64-libjpeg-turbo \
|
mingw-w64-i686-libjpeg-turbo \
|
||||||
mingw-w64-x86_64-zlib \
|
mingw-w64-i686-zlib \
|
||||||
mingw-w64-x86_64-libtiff \
|
mingw-w64-i686-libtiff \
|
||||||
mingw-w64-x86_64-freetype \
|
mingw-w64-i686-freetype \
|
||||||
mingw-w64-x86_64-lcms2 \
|
mingw-w64-i686-lcms2 \
|
||||||
mingw-w64-x86_64-libwebp \
|
mingw-w64-i686-libwebp \
|
||||||
mingw-w64-x86_64-openjpeg2 \
|
mingw-w64-i686-openjpeg2 \
|
||||||
mingw-w64-x86_64-libimagequant \
|
mingw-w64-i686-libimagequant \
|
||||||
mingw-w64-x86_64-libraqm \
|
mingw-w64-i686-libraqm \
|
||||||
mingw-w64-x86_64-SDL \
|
mingw-w64-i686-SDL \
|
||||||
mingw-w64-x86_64-clang \
|
mingw-w64-i686-clang \
|
||||||
mingw-w64-x86_64-nsis
|
mingw-w64-i686-openssl \
|
||||||
|
mingw-w64-i686-nsis
|
||||||
python -m pip install clang
|
python -m pip install clang
|
||||||
|
|
||||||
- name: Install Qt
|
- name: Install Qt
|
||||||
uses: jurplel/install-qt-action@v3
|
uses: jurplel/install-qt-action@v3
|
||||||
with:
|
with:
|
||||||
cache: true
|
cache: true
|
||||||
cache-key-prefix: 'install-qt-action-win64'
|
cache-key-prefix: 'install-qt-action-win32'
|
||||||
version: ${{ env.QT_VERSION }}
|
version: ${{ env.QT_VERSION }}
|
||||||
arch: ${{ env.MINGW_VERSION }}
|
arch: ${{ env.MINGW_VERSION }}
|
||||||
tools: 'tools_opensslv3_x64'
|
# tools: 'tools_opensslv3_x64'
|
||||||
|
|
||||||
- name: Install ARM toolchain
|
- name: Install ARM toolchain
|
||||||
uses: fiam/arm-none-eabi-gcc@v1
|
uses: fiam/arm-none-eabi-gcc@v1
|
||||||
|
@ -92,6 +93,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
ls $RUNNER_WORKSPACE/Qt/Tools/ && \
|
ls $RUNNER_WORKSPACE/Qt/Tools/ && \
|
||||||
ls $RUNNER_WORKSPACE/Qt/Tools/OpenSSLv3/ && \
|
ls $RUNNER_WORKSPACE/Qt/Tools/OpenSSLv3/ && \
|
||||||
|
ls $RUNNER_WORKSPACE/Qt/Tools/OpenSSLv3/Win_x64 && \
|
||||||
mkdir output && \
|
mkdir output && \
|
||||||
CMAKE_PREFIX_PATH=$RUNNER_WORKSPACE/Qt/$QT_VERSION/$MINGW_PATH \
|
CMAKE_PREFIX_PATH=$RUNNER_WORKSPACE/Qt/$QT_VERSION/$MINGW_PATH \
|
||||||
QT_TOOLS_OPENSSL_ROOT_PATH=$RUNNER_WORKSPACE/Qt/Tools/OpenSSLv3/Win_x64 \
|
QT_TOOLS_OPENSSL_ROOT_PATH=$RUNNER_WORKSPACE/Qt/Tools/OpenSSLv3/Win_x64 \
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue