mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-25 18:56:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

GHA CI: put libtorrent into its own directory

Browse source 
Previously it was rooted within qbt project and it caused some issues when running
'update translations' command.
This commit is contained in:
Chocobo1 2023-11-30 16:48:25 +08:00
parent 9ecb3874d8
commit 608efc77e8
3 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/ci_macos.yaml vendored
View file

@ -24,6 +24,7 @@ jobs:
env: env:
boost_path: "${{ github.workspace }}/../boost" boost_path: "${{ github.workspace }}/../boost"
openssl_root: /usr/local/opt/openssl@3 openssl_root: /usr/local/opt/openssl@3
libtorrent_path: "${{ github.workspace }}/../libtorrent"
steps: steps:
- name: Checkout repository - name: Checkout repository
@ -72,8 +73,9 @@ jobs:
--branch v${{ matrix.libt_version }} \ --branch v${{ matrix.libt_version }} \
--depth 1 \ --depth 1 \
--recurse-submodules \ --recurse-submodules \
https://github.com/arvidn/libtorrent.git https://github.com/arvidn/libtorrent.git \
cd libtorrent ${{ env.libtorrent_path }}
cd ${{ env.libtorrent_path }}
cmake \ cmake \
-B build \ -B build \
-G "Ninja" \ -G "Ninja" \
@ -121,7 +123,7 @@ jobs:
mkdir upload/cmake mkdir upload/cmake
cp build/compile_commands.json upload/cmake cp build/compile_commands.json upload/cmake
mkdir upload/cmake/libtorrent mkdir upload/cmake/libtorrent
cp libtorrent/build/compile_commands.json upload/cmake/libtorrent cp ${{ env.libtorrent_path }}/build/compile_commands.json upload/cmake/libtorrent
- name: Upload build artifacts - name: Upload build artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3

8
.github/workflows/ci_ubuntu.yaml vendored
View file

@ -25,6 +25,7 @@ jobs:
env: env:
boost_path: "${{ github.workspace }}/../boost" boost_path: "${{ github.workspace }}/../boost"
harden_flags: "-D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS" harden_flags: "-D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS"
libtorrent_path: "${{ github.workspace }}/../libtorrent"
steps: steps:
- name: Checkout repository - name: Checkout repository
@ -67,8 +68,9 @@ jobs:
--branch v${{ matrix.libt_version }} \ --branch v${{ matrix.libt_version }} \
--depth 1 \ --depth 1 \
--recurse-submodules \ --recurse-submodules \
https://github.com/arvidn/libtorrent.git https://github.com/arvidn/libtorrent.git \
cd libtorrent ${{ env.libtorrent_path }}
cd ${{ env.libtorrent_path }}
CXXFLAGS="$CXXFLAGS ${{ env.harden_flags }}" \ CXXFLAGS="$CXXFLAGS ${{ env.harden_flags }}" \
cmake \ cmake \
-B build \ -B build \
@ -120,7 +122,7 @@ jobs:
mkdir upload/cmake mkdir upload/cmake
cp build/compile_commands.json upload/cmake cp build/compile_commands.json upload/cmake
mkdir upload/cmake/libtorrent mkdir upload/cmake/libtorrent
cp libtorrent/build/compile_commands.json upload/cmake/libtorrent cp ${{ env.libtorrent_path }}/build/compile_commands.json upload/cmake/libtorrent
- name: Install AppImage - name: Install AppImage
run: | run: |

13
.github/workflows/ci_windows.yaml vendored
View file

@ -21,7 +21,7 @@ jobs:
env: env:
boost_path: "${{ github.workspace }}/../boost" boost_path: "${{ github.workspace }}/../boost"
libtorrent_path: "${{ github.workspace }}/libtorrent" libtorrent_path: "${{ github.workspace }}/../libtorrent"
vpkg_triplet_path: "${{ github.workspace }}/../triplets_overlay" vpkg_triplet_path: "${{ github.workspace }}/../triplets_overlay"
steps: steps:
@ -98,8 +98,9 @@ jobs:
--branch v${{ matrix.libt_version }} ` --branch v${{ matrix.libt_version }} `
--depth 1 ` --depth 1 `
--recurse-submodules ` --recurse-submodules `
https://github.com/arvidn/libtorrent.git https://github.com/arvidn/libtorrent.git `
cd libtorrent ${{ env.libtorrent_path }}
cd ${{ env.libtorrent_path }}
$env:CXXFLAGS+=" /guard:cf" $env:CXXFLAGS+=" /guard:cf"
$env:LDFLAGS+=" /guard:cf" $env:LDFLAGS+=" /guard:cf"
cmake ` cmake `
@ -107,7 +108,7 @@ jobs:
-G "Ninja" ` -G "Ninja" `
-DCMAKE_BUILD_TYPE=RelWithDebInfo ` -DCMAKE_BUILD_TYPE=RelWithDebInfo `
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON ` -DCMAKE_EXPORT_COMPILE_COMMANDS=ON `
-DCMAKE_INSTALL_PREFIX="${{ env.libtorrent_path }}" ` -DCMAKE_INSTALL_PREFIX="${{ env.libtorrent_path }}/install" `
-DCMAKE_TOOLCHAIN_FILE="${{ env.RUNVCPKG_VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" ` -DCMAKE_TOOLCHAIN_FILE="${{ env.RUNVCPKG_VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" `
-DBOOST_ROOT="${{ env.boost_path }}" ` -DBOOST_ROOT="${{ env.boost_path }}" `
-DBUILD_SHARED_LIBS=OFF ` -DBUILD_SHARED_LIBS=OFF `
@ -127,7 +128,7 @@ jobs:
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON ` -DCMAKE_EXPORT_COMPILE_COMMANDS=ON `
-DCMAKE_TOOLCHAIN_FILE="${{ env.RUNVCPKG_VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" ` -DCMAKE_TOOLCHAIN_FILE="${{ env.RUNVCPKG_VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" `
-DBOOST_ROOT="${{ env.boost_path }}" ` -DBOOST_ROOT="${{ env.boost_path }}" `
-DLibtorrentRasterbar_DIR="${{ env.libtorrent_path }}/lib/cmake/LibtorrentRasterbar" ` -DLibtorrentRasterbar_DIR="${{ env.libtorrent_path }}/install/lib/cmake/LibtorrentRasterbar" `
-DMSVC_RUNTIME_DYNAMIC=ON ` -DMSVC_RUNTIME_DYNAMIC=ON `
-DTESTING=ON ` -DTESTING=ON `
-DVCPKG_TARGET_TRIPLET=x64-windows-static-md-release ` -DVCPKG_TARGET_TRIPLET=x64-windows-static-md-release `
@ -170,7 +171,7 @@ jobs:
copy build/compile_commands.json upload/cmake copy build/compile_commands.json upload/cmake
copy build/target_graph.dot upload/cmake copy build/target_graph.dot upload/cmake
mkdir upload/cmake/libtorrent mkdir upload/cmake/libtorrent
copy libtorrent/build/compile_commands.json upload/cmake/libtorrent copy ${{ env.libtorrent_path }}/build/compile_commands.json upload/cmake/libtorrent
- name: Upload build artifacts - name: Upload build artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3