🔨 Use system qtkeychain instead of vendoring it

This commit is contained in:
2021-09-22 13:30:48 +02:00
parent 4b91df5f81
commit f34ec61276
46 changed files with 109 additions and 7275 deletions

View File

@ -7,30 +7,31 @@ jobs:
build-msvc:
name: Build Windows
runs-on: windows-latest
env:
BUILD_TOOLS_PATH: C:\apps\build-tools\
steps:
- run: echo $env:BUILD_TOOLS_PATH | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
- name: Add Conan to path
run: echo "C:\Program Files\Conan\conan\" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
- uses: actions/checkout@v2.3.4
with:
submodules: true
- name: Install JOM
shell: cmake -P {0}
run: |
file(MAKE_DIRECTORY $ENV{BUILD_TOOLS_PATH})
file(DOWNLOAD http://prdownloads.sourceforge.net/rigs-of-rods/build-tools.zip "$ENV{TMP}/build-tools.zip" SHOW_PROGRESS)
execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf "$ENV{TMP}/build-tools.zip" WORKING_DIRECTORY "$ENV{BUILD_TOOLS_PATH}")
- name: Install deps
run: choco install jom conan -y
- name: Enable Developer Command Prompt
uses: ilammy/msvc-dev-cmd@v1.9.0
- name: Cache conan packages
uses: actions/cache@v2.1.6
with:
key: win-conan-${{ hashFiles('**/conanfile.txt') }}
path: ~/.conan/
- name: Cache Qt
id: cache-qt
uses: actions/cache@v2.1.6
with:
path: ../Qt
path: '${{ github.workspace }}/qt/'
key: ${{ runner.os }}-QtCache
- name: Install Qt
@ -38,15 +39,33 @@ jobs:
with:
cached: ${{ steps.cache-qt.outputs.cache-hit }}
modules: qtwebengine
dir: '${{ github.workspace }}/qt/'
- name: Export qtkeychain
run: |
conan export recipes/qtkeychain
- name: Build
run: |
mkdir build
cd build
cmake -G"NMake Makefiles JOM" ..
conan install .. --build=missing
cmake -G"NMake Makefiles JOM" -DCMAKE_INSTALL_PREFIX=redist ..
jom
shell: cmd
- name: Install
run: |
cd build
jom install
shell: cmd
- name: Upload redist folder
uses: actions/upload-artifact@v2
with:
name: fuel-win
path: build/redist
build-gcc:
name: Build Linux
runs-on: ubuntu-latest
@ -55,23 +74,15 @@ jobs:
with:
submodules: true
- name: Cache Qt
id: cache-qt
uses: actions/cache@v2.1.6
with:
path: ../Qt
key: ${{ runner.os }}-QtCache
- name: Install Qt
uses: jurplel/install-qt-action@v2
with:
cached: ${{ steps.cache-qt.outputs.cache-hit }}
modules: qtwebengine
- name: Install qt
run: |
sudo apt-get update
sudo apt-get install qt5keychain-dev qtwebengine5-dev -y
- name: Build
run: |
mkdir build
cd build
cmake -DCMAKE_BUILD_TYPE=Release ..
make -j8
make -j4
shell: bash