update travis ci to use gcc and clang

jamolnng · May 30, 2020 · 02f1298 · 02f1298
1 parent 5c60d66
commit 02f1298
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,20 +1,33 @@
 dist: bionic
 sudo: require
 language: cpp
-compiler: gcc
+compiler:
+  - gcc
+  - clang
 addons:
   apt:
     sources:
       - ubuntu-toolchain-r-test
-    packages:
-      - gcc-6
-      - g++-6
+    # packages:
+    #   - gcc-6
+    #   - g++-6
       - cmake-data
       - cmake
 script:
-    - sudo ln -s /usr/bin/gcc-6 /usr/local/bin/gcc
-    - sudo ln -s /usr/bin/g++-6 /usr/local/bin/g++
-    - gcc -v && g++ -v && cmake --version
+    # - sudo ln -s /usr/bin/gcc-6 /usr/local/bin/gcc
+    # - sudo ln -s /usr/bin/g++-6 /usr/local/bin/g++
+    - cmake --version
+    - CC=/usr/bin/gcc
+    - CXX=/usr/bin/g++
+    - $CC --version && $CXX --version
+    - mkdir build && cd build
+    - cmake ../
+    - make
+    - make test
+    - cd .. && rm -rf build/
+    - CC=/usr/bin/clang
+    - CXX=/usr/bin/clang++
+    - $CC --version && $CXX --version
     - mkdir build && cd build
     - cmake ../
     - make

diff --git a/README.md b/README.md
@@ -73,11 +73,15 @@ int main(int argc, const char* argv[]) {
       case 2:
         std::cout << "an even more verbose string" << std::endl;
         // fall through
+#ifdef __clang__
         [[clang::fallthrough]];
+#endif
       case 1:
         std::cout << "a verbose string" << std::endl;
         // fall through
+#ifdef __clang__
         [[clang::fallthrough]];
+#endif
       default:
         std::cout << "some verbosity" << std::endl;
     }

diff --git a/example.cpp b/example.cpp
@@ -47,11 +47,15 @@ int main(int argc, const char* argv[]) {
       case 2:
         std::cout << "an even more verbose string" << std::endl;
         // fall through
+#ifdef __clang__
         [[clang::fallthrough]];
+#endif
       case 1:
         std::cout << "a verbose string" << std::endl;
         // fall through
+#ifdef __clang__
         [[clang::fallthrough]];
+#endif
       default:
         std::cout << "some verbosity" << std::endl;
     }