d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-09 13:24:26 +00:00
Code Issues Projects Releases Wiki Activity

GHA CI: remove redundant conditionals

Browse Source
This commit is contained in:
Chocobo1 2023-08-08 23:46:30 +08:00
parent 180e708f3c
commit 4d98761e99
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/ci_macos.yaml vendored
View File

@ -85,8 +85,7 @@ jobs:
cmake --build build cmake --build build
sudo cmake --install build sudo cmake --install build
- name: Build qBittorrent (Qt6) - name: Build qBittorrent
if: startsWith(matrix.qt_version, 6)
run: | run: |
CXXFLAGS="$CXXFLAGS -Wno-gnu-zero-variadic-macro-arguments -Werror -Wno-error=deprecated-declarations" \ CXXFLAGS="$CXXFLAGS -Wno-gnu-zero-variadic-macro-arguments -Werror -Wno-error=deprecated-declarations" \
LDFLAGS="$LDFLAGS -gz" \ LDFLAGS="$LDFLAGS -gz" \

7
.github/workflows/ci_ubuntu.yaml vendored
View File

@ -80,13 +80,12 @@ jobs:
# to avoid scanning 3rdparty codebases, initialize it just before building qbt # to avoid scanning 3rdparty codebases, initialize it just before building qbt
- name: Initialize CodeQL - name: Initialize CodeQL
uses: github/codeql-action/init@v2 uses: github/codeql-action/init@v2
if: startsWith(matrix.libt_version, 2) && (matrix.qbt_gui == 'GUI=ON') && startsWith(matrix.qt_version, 6) if: startsWith(matrix.libt_version, 2) && (matrix.qbt_gui == 'GUI=ON')
with: with:
config-file: ./.github/workflows/helper/codeql/cpp.yaml config-file: ./.github/workflows/helper/codeql/cpp.yaml
languages: cpp languages: cpp
- name: Build qBittorrent (Qt6) - name: Build qBittorrent
if: startsWith(matrix.qt_version, 6)
run: | run: |
CXXFLAGS="$CXXFLAGS -Werror" \ CXXFLAGS="$CXXFLAGS -Werror" \
LDFLAGS="$LDFLAGS -gz" \ LDFLAGS="$LDFLAGS -gz" \
@ -107,7 +106,7 @@ jobs:
- name: Run CodeQL analysis - name: Run CodeQL analysis
uses: github/codeql-action/analyze@v2 uses: github/codeql-action/analyze@v2
if: startsWith(matrix.libt_version, 2) && (matrix.qbt_gui == 'GUI=ON') && startsWith(matrix.qt_version, 6) if: startsWith(matrix.libt_version, 2) && (matrix.qbt_gui == 'GUI=ON')
with: with:
category: ${{ github.base_ref || github.ref_name }} category: ${{ github.base_ref || github.ref_name }}