Move cflags configure option to top level build configuration

nohlson · nohlson · commit 767308a6c169 · 2024-07-23T02:41:34.000-05:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -224,6 +224,7 @@ jobs:
       config_hash: ${{ needs.check_source.outputs.config_hash }}
       options: |
         ../cpython-ro-srcdir/configure \
+          CFLAGS="-fdiagnostics-format=json"
           --config-cache \
           --with-pydebug \
           --with-openssl=$OPENSSL_DIR
@@ -237,6 +238,7 @@ jobs:
       config_hash: ${{ needs.check_source.outputs.config_hash }}
       options: |
         ../cpython-ro-srcdir/configure \
+           CFLAGS="-fdiagnostics-format=json"
           --config-cache \
           --with-pydebug \
           --with-openssl=$OPENSSL_DIR \
diff --git a/.github/workflows/reusable-ubuntu.yml b/.github/workflows/reusable-ubuntu.yml
@@ -63,7 +63,7 @@ jobs:
         key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ inputs.config_hash }}
     - name: Configure CPython out-of-tree
       working-directory: ${{ env.CPYTHON_BUILDDIR }}
-      run: ${{ inputs.options }} CFLAGS="-fdiagnostics-format=json"
+      run: ${{ inputs.options }}
     - name: Build CPython out-of-tree
       working-directory: ${{ env.CPYTHON_BUILDDIR }}
       run: make -j4 &> compiler_output.txt
diff --git a/Tools/build/check_warnings.py b/Tools/build/check_warnings.py
@@ -69,9 +69,8 @@ def get_unexpected_warnings(
         for warning in unexpected_warnings:
             print(warning)
         return 1
-    
-    return 0
 
+    return 0
 
 def get_unexpected_improvements(
     warnings: list[dict],
