mirror of
https://github.com/Qv2ray/Qv2ray.git
synced 2025-05-20 10:50:23 +08:00
cmake: CI: try using ninja
This commit is contained in:
parent
206e7a1338
commit
cba8a028ad
9
.github/workflows/build-qv2ray-cmake.yml
vendored
9
.github/workflows/build-qv2ray-cmake.yml
vendored
@ -75,13 +75,14 @@ jobs:
|
|||||||
sudo add-apt-repository ppa:webispy/grpc
|
sudo add-apt-repository ppa:webispy/grpc
|
||||||
sudo add-apt-repository ppa:carsten-uppenbrink-net/openssl
|
sudo add-apt-repository ppa:carsten-uppenbrink-net/openssl
|
||||||
sudo apt update
|
sudo apt update
|
||||||
sudo apt install -y libgl-dev libx11-dev libxkbcommon-x11-dev libssl-dev libprotobuf-dev protobuf-compiler protobuf-c-compiler libgrpc++-dev protobuf-compiler-grpc tree
|
sudo apt install -y libgl-dev libx11-dev libxkbcommon-x11-dev libssl-dev libprotobuf-dev protobuf-compiler protobuf-c-compiler libgrpc++-dev protobuf-compiler-grpc tree ninja-build
|
||||||
# --------------------------------------------------------
|
# --------------------------------------------------------
|
||||||
- name: macOS - ${{ matrix.qt_version }} - Build preparation - Install Packages
|
- name: macOS - ${{ matrix.qt_version }} - Build preparation - Install Packages
|
||||||
if: matrix.platform == 'macos-latest'
|
if: matrix.platform == 'macos-latest'
|
||||||
run: |
|
run: |
|
||||||
brew install protobuf
|
brew install protobuf
|
||||||
brew install grpc
|
brew install grpc
|
||||||
|
brew install ninja
|
||||||
# --------------------------------------------------------
|
# --------------------------------------------------------
|
||||||
- name: Win-${{ matrix.arch }} - ${{ matrix.qt_version }} - Build preparation - Download Dependencies
|
- name: Win-${{ matrix.arch }} - ${{ matrix.qt_version }} - Build preparation - Download Dependencies
|
||||||
shell: bash
|
shell: bash
|
||||||
@ -102,7 +103,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
mkdir build
|
mkdir build
|
||||||
cd build
|
cd build
|
||||||
cmake ..
|
cmake .. -GNinja
|
||||||
cmake --build . --parallel $(sysctl -n hw.logicalcpu)
|
cmake --build . --parallel $(sysctl -n hw.logicalcpu)
|
||||||
sudo cmake --install .
|
sudo cmake --install .
|
||||||
sudo chmod -Rv a+rw ./
|
sudo chmod -Rv a+rw ./
|
||||||
@ -113,7 +114,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
mkdir build
|
mkdir build
|
||||||
cd build
|
cd build
|
||||||
cmake .. -GNinja -A ${{ matrix.buildarch }}
|
cmake .. -GNinja
|
||||||
cmake --build . --parallel $(nproc)
|
cmake --build . --parallel $(nproc)
|
||||||
# --------------------------------------------------------
|
# --------------------------------------------------------
|
||||||
- name: Linux - ${{ matrix.qt_version }} - Generate Dependencies and Build
|
- name: Linux - ${{ matrix.qt_version }} - Generate Dependencies and Build
|
||||||
@ -125,7 +126,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
mkdir build
|
mkdir build
|
||||||
cd build
|
cd build
|
||||||
cmake .. -DCMAKE_INSTALL_PREFIX=./AppDir/usr
|
cmake .. -GNinja -DCMAKE_INSTALL_PREFIX=./AppDir/usr
|
||||||
cmake --build . --parallel $(nproc)
|
cmake --build . --parallel $(nproc)
|
||||||
cmake --install .
|
cmake --install .
|
||||||
# ========================================================================================================= Build
|
# ========================================================================================================= Build
|
||||||
|
Loading…
Reference in New Issue
Block a user