Delete macos and windows setup environment, fix CI build

YACLib · Apr 1, 2023 · 1f7306e · 1f7306e
1 parent ad7ef37
commit 1f7306e
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 422 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -48,6 +48,7 @@ jobs:
         run: |
           wait_type=""
           compilers=(g++)
+          c_compilers=(gcc)
           for (( i=0; i<${#compilers[*]}; i+=1 )); do
             dir="build_${compilers[$i]}"
             echo $dir
@@ -56,6 +57,7 @@ jobs:
               -G "Ninja"                                                                                             \
               -DCMAKE_BUILD_TYPE=Debug                                                                               \
               -DCMAKE_CXX_COMPILER="${compilers[$i]}"                                                              \
+              -DCMAKE_C_COMPILER="${c_compilers[$i]}"                                                              \
               -DIONE_TEST=SINGLE                                                                                   \
               -DIONE_FLAGS="COVERAGE;$wait_type"                                                              \
               -DIONE_CXX_STANDARD=20                                                                               \
@@ -88,6 +90,7 @@ jobs:
                 exec llvm-cov-14 gcov "$@"' > ./llvm_gcov.sh
           chmod +x ./llvm_gcov.sh
           compilers=(g++)
+          c_compilers=(gcc)
           for (( i=0; i<${#compilers[*]}; i+=1 )); do
             dir="build_${compilers[$i]}"
             echo $dir

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -25,8 +25,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ 20.04, 22.04 ]
-        compiler: [ clang-8, clang-9, clang-10, clang-11, clang-12, clang-13, clang-14,
-                    gcc-7, gcc-8, gcc-9, gcc-10, gcc-11, gcc-12 ]
+        compiler: [ clang-9, clang-10, clang-11, clang-12, clang-13, clang-14,
+                    gcc-10, gcc-11, gcc-12 ]
         isPR:
           - ${{ github.event_name == 'pull_request' }}
         exclude:
@@ -38,9 +38,6 @@ jobs:
             os: 20.04
             compiler: gcc-12
 
-          - isPR: true
-            os: 22.04
-            compiler: clang-8
           - isPR: true
             os: 22.04
             compiler: clang-9
@@ -60,15 +57,6 @@ jobs:
             os: 22.04
             compiler: clang-14
 
-          - isPR: true
-            os: 22.04
-            compiler: gcc-7
-          - isPR: true
-            os: 22.04
-            compiler: gcc-8
-          - isPR: true
-            os: 22.04
-            compiler: gcc-9
           - isPR: true
             os: 22.04
             compiler: gcc-10
@@ -89,13 +77,6 @@ jobs:
             os: 22.04
             compiler: clang-10
 
-          - isPR: false
-            os: 22.04
-            compiler: gcc-7
-          - isPR: false
-            os: 22.04
-            compiler: gcc-8
-
 
     env:
       BUILD_TYPE: 'Debug RelWithDebInfo'
@@ -175,15 +156,14 @@ jobs:
           compiler=${{ matrix.compiler }}
           if [[ "$compiler" == gcc* ]]; then
             version=${compiler:4}
+            c_compiler="gcc"
             compiler="g++"
-            standard=17; flags=""
-            if [[ $version -ge 10 ]]; then
-              standard=20;
-            fi
           else
             version=${compiler:6}
+            c_compiler="clang-$version"
             compiler="clang++-$version"
           fi
+          
 
           stdlib_names=(libcxx libstdcxx)
           link_options=(
@@ -205,23 +185,19 @@ jobs:
               else
                 link_option=${link_options[$j]}; compile_option=${compile_options[$j]}
                 if [[ "${stdlib_names[$j]}" == "libstdcxx" ]]; then
-                  standard=17;
-                elif [[ $version -ge 9 ]]; then
-                  standard=20;
-                else
-                  standard=17;
+                  continue;
                 fi
               fi
-
               dir="build_${compiler}_${stdlib_names[$j]}_${build_type}"
               echo $dir
 
               cmake -S . -B $dir                                                                                       \
                 -DCMAKE_BUILD_TYPE="$build_type"                                                                       \
-                -DIONE_CXX_STANDARD="$standard"                                                                      \
+                -DIONE_CXX_STANDARD="20"                                                                      \
                 -DIONE_TEST=SINGLE                                                                                   \
                 -DIONE_FLAGS="$flags"                                                                                \
                 -DCMAKE_CXX_COMPILER="$compiler"                                                                       \
+                -DCMAKE_C_COMPILER="$c_compiler"                                                                       \
                 -G"Ninja"                                                                                              \
                 -DIONE_LINK_OPTIONS="$link_option"                                                                   \
                 -DIONE_COMPILE_OPTIONS="$compile_option"

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml