Fix clang 14 error + add Ubuntu 22.04 to supported OS

* Add ubuntu 22.04 to CI * Generalize dependency script to run for multiple ubuntu versions * Add clang 14 to CI * bugfix for clang14 * Disable clang-14 on macos * Update checkout to v3 * Fix missing header and add more explicit builds * Exclude non supported compilers * Clean up CI matrix Co-authored-by: Hamish Hunt <[email protected]>
Alisonlx · Dec 2, 2022 · 8db5521 · 8db5521
1 parent acdb264
commit 8db5521
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml
@@ -38,24 +38,19 @@ jobs:
         # TODO: shared builds
         package_build: [ON, OFF]
         hexl: [ON, OFF]
-        c_compiler: [gcc, gcc-10, clang]
-        os: [macos-latest, ubuntu-20.04]
+        c_compiler: [gcc, clang]
+        os: [macos-latest, ubuntu-20.04, ubuntu-22.04]
         include: # Use g++ with gcc only and clang++ with clang only
           - c_compiler: gcc
             cxx_compiler: g++
           - c_compiler: clang
             cxx_compiler: clang++
-          - c_compiler: gcc-10
-            cxx_compiler: g++-10
         exclude: 
           # Skip HEXL package build
           - package_build: ON
             hexl: ON
-          # Skip gcc-10 on macos-latest
-          - c_compiler: gcc-10
-            os: macos-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: |
           set -x
           env

diff --git a/ci/install_deps.sh b/ci/install_deps.sh
@@ -49,7 +49,8 @@ fi
 
 cd $HOME
 
-if [ "${RUNNER_OS}" == "ubuntu-20.04" ]; then
+# Remove substr after dash char e.g. ubuntu20.04 -> ubuntu
+if [ "${RUNNER_OS%-*}" == "ubuntu" ]; then
     sudo apt-get -yq --no-install-suggests --no-install-recommends install libgmp-dev libntl-dev bats
 fi
 

diff --git a/utils/common/common.h b/utils/common/common.h
@@ -14,6 +14,7 @@
 #define COMMON_H
 
 #include <iostream>
+#include <iterator>
 #include <fstream>
 
 #include <helib/helib.h>