Browse Source

GHA CI: don't overwrite system default compile flags

System might have some default compile flags which are crucial for security hardening so we
should append our flags instead of overwriting them.
adaptive-webui-19844
Chocobo1 2 years ago
parent
commit
19f55512c1
  1. 4
      .github/workflows/ci_macos.yaml
  2. 4
      .github/workflows/ci_ubuntu.yaml

4
.github/workflows/ci_macos.yaml

@ -86,11 +86,11 @@ jobs:
- name: Build qBittorrent (Qt5) - name: Build qBittorrent (Qt5)
if: ${{ startsWith(matrix.qt_version, 5) }} if: ${{ startsWith(matrix.qt_version, 5) }}
run: | run: |
CXXFLAGS="$CXXFLAGS -Werror -Wno-error=deprecated-declarations" \
cmake \ cmake \
-B build \ -B build \
-G "Ninja" \ -G "Ninja" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_CXX_FLAGS="-Werror -Wno-error=deprecated-declarations" \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DBOOST_ROOT="${{ env.boost_path }}" \ -DBOOST_ROOT="${{ env.boost_path }}" \
-DOPENSSL_ROOT_DIR="${{ env.openssl_root }}" \ -DOPENSSL_ROOT_DIR="${{ env.openssl_root }}" \
@ -104,11 +104,11 @@ jobs:
- name: Build qBittorrent (Qt6) - name: Build qBittorrent (Qt6)
if: ${{ startsWith(matrix.qt_version, 6) }} if: ${{ startsWith(matrix.qt_version, 6) }}
run: | run: |
CXXFLAGS="$CXXFLAGS -Wno-gnu-zero-variadic-macro-arguments -Werror -Wno-error=deprecated-declarations" \
cmake \ cmake \
-B build \ -B build \
-G "Ninja" \ -G "Ninja" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_CXX_FLAGS="-Wno-gnu-zero-variadic-macro-arguments -Werror -Wno-error=deprecated-declarations" \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DBOOST_ROOT="${{ env.boost_path }}" \ -DBOOST_ROOT="${{ env.boost_path }}" \
-DOPENSSL_ROOT_DIR="${{ env.openssl_root }}" \ -DOPENSSL_ROOT_DIR="${{ env.openssl_root }}" \

4
.github/workflows/ci_ubuntu.yaml

@ -68,11 +68,11 @@ jobs:
- name: Build qBittorrent (Qt5) - name: Build qBittorrent (Qt5)
if: ${{ startsWith(matrix.qt_version, 5) }} if: ${{ startsWith(matrix.qt_version, 5) }}
run: | run: |
CXXFLAGS="$CXXFLAGS -Werror -Wno-error=deprecated-declarations" \
cmake \ cmake \
-B build \ -B build \
-G "Ninja" \ -G "Ninja" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_CXX_FLAGS="-Werror -Wno-error=deprecated-declarations" \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_INSTALL_PREFIX="/usr" \
-DTESTING=ON \ -DTESTING=ON \
@ -86,11 +86,11 @@ jobs:
- name: Build qBittorrent (Qt6) - name: Build qBittorrent (Qt6)
if: ${{ startsWith(matrix.qt_version, 6) }} if: ${{ startsWith(matrix.qt_version, 6) }}
run: | run: |
CXXFLAGS="$CXXFLAGS -Werror" \
cmake \ cmake \
-B build \ -B build \
-G "Ninja" \ -G "Ninja" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_CXX_FLAGS="-Werror" \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_INSTALL_PREFIX="/usr" \
-DQT6=ON \ -DQT6=ON \

Loading…
Cancel
Save