Browse Source

GHA CI: remove redundant conditionals

adaptive-webui-19844
Chocobo1 1 year ago
parent
commit
4d98761e99
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
  1. 3
      .github/workflows/ci_macos.yaml
  2. 7
      .github/workflows/ci_ubuntu.yaml

3
.github/workflows/ci_macos.yaml

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

7
.github/workflows/ci_ubuntu.yaml

@ -80,13 +80,12 @@ jobs: @@ -80,13 +80,12 @@ jobs:
# to avoid scanning 3rdparty codebases, initialize it just before building qbt
- name: Initialize CodeQL
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:
config-file: ./.github/workflows/helper/codeql/cpp.yaml
languages: cpp
- name: Build qBittorrent (Qt6)
if: startsWith(matrix.qt_version, 6)
- name: Build qBittorrent
run: |
CXXFLAGS="$CXXFLAGS -Werror" \
LDFLAGS="$LDFLAGS -gz" \
@ -107,7 +106,7 @@ jobs: @@ -107,7 +106,7 @@ jobs:
- name: Run CodeQL analysis
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:
category: ${{ github.base_ref || github.ref_name }}

Loading…
Cancel
Save