Northern_Lights/nekoray_Mahdi-zarei
1
0
Fork 0
mirror of https://github.com/Mahdi-zarei/nekoray.git synced 2025-12-19 13:42:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update ubuntu QT to 6.5

Browse Source
This commit is contained in:
unknown 2024-05-31 05:05:33 +03:30
parent 9f88131252
commit 43f4de3fe0
No known key found for this signature in database
GPG Key ID: C2CA486E4F771093
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
.github/workflows/build-qv2ray-cmake.yml vendored
View File

@ -61,7 +61,7 @@ jobs:
- platform: windows-2022
arch: x64
qt_version: "6.5"
- platform: ubuntu-20.04
- platform: ubuntu-22.04
arch: x64
qt_version: "5.12"
- platform: macos-14
@ -92,6 +92,14 @@ jobs:
uses: actions/download-artifact@v4.1.7
with:
path: download-artifact
- name: Linux - Install Qt 6.5
if: matrix.platform == 'ubuntu-22.04'
uses: jurplel/install-qt-action@v4.0.0
with:
version: 6.5
setup-python: true
cache: true
cache-key-prefix: QtCache-${{ matrix.platform }}-${{ matrix.arch }}
- name: macOS - Install Qt 6.5
if: matrix.platform == 'macos-14'
uses: jurplel/install-qt-action@v4.0.0
@ -118,17 +126,8 @@ jobs:
key: DepsCache-${{ matrix.platform }}-${{ matrix.arch }}-${{ hashFiles('libs/build_deps_*.sh') }}-Qt${{ matrix.qt_version }}
- name: Build Dependencies
shell: bash
if: steps.cache-deps.outputs.cache-hit != 'true' && matrix.platform != 'ubuntu-20.04'
if: steps.cache-deps.outputs.cache-hit != 'true'
run: ./libs/build_deps_all.sh
- name: Build Dependencies (Docker)
shell: bash
if: steps.cache-deps.outputs.cache-hit != 'true' && matrix.platform == 'ubuntu-20.04'
run: |
docker run --rm \
-v $PWD:/nekoray \
-w /nekoray \
ghcr.io/matsuridayo/debian10-qt5:20230131 \
bash -c "./libs/build_deps_all.sh"
# ========================================================================================================= Generate MakeFile and Build
- name: Windows - Generate MakeFile and Build
shell: bash
@ -147,13 +146,14 @@ jobs:
./libs/deploy_windows64.sh
- name: Linux - Generate MakeFile and Build
shell: bash
if: matrix.platform == 'ubuntu-20.04'
if: matrix.platform == 'ubuntu-22.04'
run: |
docker run --rm \
-v $PWD:/nekoray \
-w /nekoray \
ghcr.io/matsuridayo/debian10-qt5:20230131 \
bash -c "mkdir build && pushd build && cmake -GNinja -DCMAKE_BUILD_TYPE=Release .. && ninja && popd &&./libs/deploy_linux64.sh"
mkdir build
pushd build
cmake -GNinja -DQT_VERSION_MAJOR=6 -DCMAKE_BUILD_TYPE=Release ..
ninja
popd
./libs/deploy_linux64.sh
- name: macOS - Generate MakeFile and Build
shell: bash
if: matrix.platform == 'macos-14'

2
CMakeLists.txt
View File

@ -17,7 +17,7 @@ endif ()
# Find Qt
if (NOT QT_VERSION_MAJOR)
set(QT_VERSION_MAJOR 5)
set(QT_VERSION_MAJOR 6)
endif ()
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets Network Svg LinguistTools)