From cba5970cd8a330b5f4d4a26281121fac90815a6b Mon Sep 17 00:00:00 2001
From: Victor Zverovich <victor.zverovich@gmail.com>
Date: Tue, 3 Nov 2020 16:48:01 -0800
Subject: [PATCH] Remove migrated build configs

---
 .github/workflows/doc.yml   | 23 +++++++++++
 .github/workflows/linux.yml | 16 +++++---
 .travis.yml                 | 78 -------------------------------------
 3 files changed, 33 insertions(+), 84 deletions(-)
 create mode 100644 .github/workflows/doc.yml

diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml
new file mode 100644
index 00000000..93556043
--- /dev/null
+++ b/.github/workflows/doc.yml
@@ -0,0 +1,23 @@
+name: doc
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Create Build Environment
+      run: |
+        sudo apt install doxygen
+        cmake -E make_directory ${{runner.workspace}}/build
+
+    - name: Configure
+      working-directory: ${{runner.workspace}}/build
+      run: cmake -DCMAKE_BUILD_TYPE=${{matrix.build_type}} $GITHUB_WORKSPACE
+
+    - name: Build
+      working-directory: ${{runner.workspace}}/build
+      run: cmake --build . --config ${{matrix.build_type}}
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index fce0d715..582b798a 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -9,23 +9,27 @@ jobs:
       matrix:
         cxx: [g++-4.8, g++-8, g++-10, clang++]
         build_type: [Debug, Release]
+        include:
+          - cxx: clang++
+            build_type: Debug
+            fuzz: -DFMT_FUZZ=ON -DFMT_FUZZ_LINKMAIN=ON
+          - cxx: g++-4.8
+            install: sudo apt install g++-4.8
 
     steps:
     - uses: actions/checkout@v2
 
-    - name: Install GCC
-      if: matrix.cxx == 'g++-4.8'
-      run: sudo apt install g++-4.8
-
     - name: Create Build Environment
-      run: cmake -E make_directory ${{runner.workspace}}/build
+      run: |
+        ${{matrix.install}}
+        cmake -E make_directory ${{runner.workspace}}/build
 
     - name: Configure
       working-directory: ${{runner.workspace}}/build
       env:
         CXX: ${{matrix.cxx}}
       run: |
-        cmake -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
+        cmake -DCMAKE_BUILD_TYPE=${{matrix.build_type}} ${{matrix.fuzz}} \
               -DFMT_DOC=OFF -DFMT_PEDANTIC=ON -DFMT_WERROR=ON $GITHUB_WORKSPACE
 
     - name: Build
diff --git a/.travis.yml b/.travis.yml
index ff9d167b..f3a0cd63 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,86 +16,8 @@ env:
 
 matrix:
   include:
-      # Documentation
     - env: BUILD=Doc
       sudo: required
-      # g++ 6 on Linux with C++14
-    - env: COMPILER=g++-6 BUILD=Debug STANDARD=14
-      compiler: gcc
-      addons:
-        apt:
-          update: true
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-6
-    - env: COMPILER=g++-6 BUILD=Release STANDARD=14
-      compiler: gcc
-      addons:
-        apt:
-          update: true
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-6
-     # g++ 8 on Linux with C++17
-    - env: COMPILER=g++-8 BUILD=Debug STANDARD=17
-      compiler: gcc
-      addons:
-        apt:
-          update: true
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-8
-    - env: COMPILER=g++-8 BUILD=Release STANDARD=17
-      compiler: gcc
-      addons:
-        apt:
-          update: true
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-8
-
-      # Apple clang on OS X with C++14
-    - env: BUILD=Debug STANDARD=14
-      compiler: clang
-      os: osx
-    - env: BUILD=Release STANDARD=14
-      compiler: clang
-      os: osx
-      # clang 6.0 on Linux with C++14 (builds the fuzzers as well)
-    - env: COMPILER=clang++-6.0 BUILD=Debug STANDARD=14 ENABLE_FUZZING=1
-      compiler: clang
-      addons:
-        apt:
-          update: true
-          packages:
-            - clang-6.0
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty
-            - llvm-toolchain-trusty-6.0
-      # clang 4.0 on Linux with C++14
-    - env: COMPILER=clang++-4.0 BUILD=Debug STANDARD=11
-      compiler: clang
-      addons:
-        apt:
-          update: true
-          packages:
-            - clang-4.0
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty
-            - llvm-toolchain-trusty-4.0
-      # g++ 4.8 on Linux with C++11
-    - env: COMPILER=g++-4.8 BUILD=Debug STANDARD=11
-      compiler: gcc
-
-before_script:
-  - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then export CXX=${COMPILER}; fi
-  - if [[ "${BUILD}" != "Doc" ]]; then ${CXX} --version; fi
 
 script:
   - support/travis-build.py