Merge branch 'develop' of https://github.com/pvpgn/pvpgn-server into develop

2020-09-19 17:12:22 -07:00 · 2020-09-19 17:12:22 -07:00 · 6e95caa6d6
commit 6e95caa6d6
parent e03b58d1e2 a88419daa6
2 changed files with 5 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,9 +1,11 @@
 os: linux
-dist: bionic
+dist: focal
 arch: amd64

 language: cpp
-compiler: gcc
+compiler:
+  - clang
+  - gcc
  
 branches:
  only:
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -104,3 +104,4 @@ configure_file(

 add_custom_target(purge
    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_MODULE_PATH}/cmake_purge.cmake)
+