move some flags to env

.github/workflows/build-and-test.yml

@@ -27,12 +27,21 @@ jobs:
           - displayTargetName: windows-latest-debug
             os: windows-latest
             build_type: 'Debug'
+    env:
+      EXTRA_FLAGS: ''
+      BUILD_32_BITS: 'off'
     steps:
       - uses: actions/checkout@v2
 
       - name: install 32-bit
         if: matrix.bits == '32'
         run: sudo apt -y install g++-multilib libc6-i386
+        
+      - name: set 32-bit env
+        if: matrix.bits == '32'
+        run: |
+          echo "EXTRA_FLAGS='-m32'" >> $GITHUB_ENV
+          echo "BUILD_32_BITS='on'" >> $GITHUB_ENV
 
       - name: create build environment
         run: cmake -E make_directory ${{ runner.workspace }}/_build
@@ -45,7 +54,8 @@ jobs:
         run: >
           cmake $GITHUB_WORKSPACE
           -DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON
-          -DBENCHMARK_BUILD_32_BITS=${{ matrix.bits == 32 }}
+          -DBENCHMARK_BUILD_32_BITS=${{ env.BUILD_32_BITS }}
+          -DEXTRA_FLAGS=${{ env.EXTRA_FLAGS }}
           -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
 
       - name: build
@@ -65,15 +75,10 @@ jobs:
       fail-fast: false
       matrix:
         build_type: ['Release', 'Debug']
-        compiler: [g++-4.8, clang++-3.6]
-        include:
-          - compiler: 'g++-6'
-            build_type: 'Debug'
-            run_tests: true
-          - compiler: 'g++-6'
-            build_type: 'Release'
-            run_tests: true
+        compiler: [g++-4.8, clang++-3.6, g++-6]
     container: ubuntu:14.04
+    env:
+      ENABLE_TESTING: 'off'
     steps:
       - uses: actions/checkout@v2
 
@@ -85,6 +90,7 @@ jobs:
       - if: matrix.compiler == 'g++-6'
         name: install other bits
         run: |
+          echo "ENABLE_TESTING='on'" >> $GITHUB_ENV
           sudo apt -y install software-properties-common
           sudo add-apt-repository -y "ppa:ubuntu-toolchain-r/test"
           sudo apt update
@@ -100,9 +106,9 @@ jobs:
         working-directory: ${{ github.workspace }}/_build
         run: >
           cmake $GITHUB_WORKSPACE
-          -DBENCHMARK_ENABLE_TESTING=${{ matrix.run_tests }}
+          -DBENCHMARK_ENABLE_TESTING=${{ env.ENABLE_TESTING }}
           -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-          -DBENCHMARK_DOWNLOAD_DEPENDENCIES=${{ matrix.run_tests }}
+          -DBENCHMARK_DOWNLOAD_DEPENDENCIES=${{ env.ENABLE_TESTING }}
 
       - name: build
         shell: bash