fixed release build in travis and create deb and rpm packages

zussel · Jan 4, 2018 · 85f01d6 · 85f01d6
1 parent 060440b
commit 85f01d6
Show file tree

Hide file tree

Showing 2 changed files with 184 additions and 159 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,128 +13,128 @@ matrix:
     #   compiler: clang
 
     # clang-3.6 32
-    - env: CLANG_VERSION=3.6 BUILD_TYPE=Debug ARCH=32
-      os: linux
-      addons: &clang36-32
-        apt:
-          packages:
-            - cmake
-            - cmake-data
-            - clang-3.6
-            - linux-libc-dev:i386
-            - g++-multilib
-            - gcc-multilib
-          sources:
-            - george-edison55-precise-backports
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.6
-
-    - env: CLANG_VERSION=3.6 BUILD_TYPE=Release ARCH=32
-      os: linux
-      addons: *clang36-32
-
-    # clang-3.6 64
-    - env: CLANG_VERSION=3.6 BUILD_TYPE=Debug ARCH=64
-      os: linux
-      addons: &clang36-64
-        apt:
-          packages:
-            - cmake
-            - cmake-data
-            - clang-3.6
-            - g++
-            - gcc
-          sources:
-            - george-edison55-precise-backports
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.6
-
-    - env: CLANG_VERSION=3.6 BUILD_TYPE=Release ARCH=64
-      os: linux
-      addons: *clang36-64
+#    - env: CLANG_VERSION=3.6 BUILD_TYPE=Debug ARCH=32
+#      os: linux
+#      addons: &clang36-32
+#        apt:
+#          packages:
+#            - cmake
+#            - cmake-data
+#            - clang-3.6
+#            - linux-libc-dev:i386
+#            - g++-multilib
+#            - gcc-multilib
+#          sources:
+#            - george-edison55-precise-backports
+#            - ubuntu-toolchain-r-test
+#            - llvm-toolchain-precise-3.6
+#
+#    - env: CLANG_VERSION=3.6 BUILD_TYPE=Release ARCH=32
+#      os: linux
+#      addons: *clang36-32
+#
+#     clang-3.6 64
+#    - env: CLANG_VERSION=3.6 BUILD_TYPE=Debug ARCH=64
+#      os: linux
+#      addons: &clang36-64
+#        apt:
+#          packages:
+#            - cmake
+#            - cmake-data
+#            - clang-3.6
+#            - g++
+#            - gcc
+#          sources:
+#            - george-edison55-precise-backports
+#            - ubuntu-toolchain-r-test
+#            - llvm-toolchain-precise-3.6
+#
+#    - env: CLANG_VERSION=3.6 BUILD_TYPE=Release ARCH=64
+#      os: linux
+#      addons: *clang36-64
 
     # clang-3.7 32
-    - env: CLANG_VERSION=3.7 BUILD_TYPE=Debug ARCH=32
-      os: linux
-      addons: &clang37-32
-        apt:
-          packages:
-            - cmake
-            - cmake-data
-            - clang-3.7
-            - linux-libc-dev:i386
-            - g++-multilib
-            - gcc-multilib
-          sources:
-            - george-edison55-precise-backports
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.7
-
-    - env: CLANG_VERSION=3.7 BUILD_TYPE=Release ARCH=32
-      os: linux
-      addons: *clang37-32
-
-    # clang-3.7 64
-    - env: CLANG_VERSION=3.7 BUILD_TYPE=Debug ARCH=64
-      os: linux
-      addons: &clang37-64
-        apt:
-          packages:
-            - cmake
-            - cmake-data
-            - clang-3.7
-            - g++
-            - gcc
-          sources:
-            - george-edison55-precise-backports
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.7
-
-    - env: CLANG_VERSION=3.7 BUILD_TYPE=Release ARCH=64
-      os: linux
-      addons: *clang37-64
-
-
-    # clang-3.8 32
-    - env: CLANG_VERSION=3.8 BUILD_TYPE=Debug ARCH=32
-      os: linux
-      addons: &clang38-32
-        apt:
-          packages:
-            - cmake
-            - cmake-data
-            - clang-3.8
-            - linux-libc-dev:i386
-            - g++-multilib
-            - gcc-multilib
-          sources:
-            - george-edison55-precise-backports
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.8
-
-    - env: CLANG_VERSION=3.8 BUILD_TYPE=Release ARCH=32
-      os: linux
-      addons: *clang38-32
-
-    # clang-3.8 64
-    - env: CLANG_VERSION=3.8 BUILD_TYPE=Debug ARCH=64
-      os: linux
-      addons: &clang38-64
-        apt:
-          packages:
-            - cmake
-            - cmake-data
-            - clang-3.8
-            - g++
-            - gcc
-          sources:
-            - george-edison55-precise-backports
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.8
-
-    - env: CLANG_VERSION=3.8 BUILD_TYPE=Release ARCH=64
-      os: linux
-      addons: *clang38-64
+#    - env: CLANG_VERSION=3.7 BUILD_TYPE=Debug ARCH=32
+#      os: linux
+#      addons: &clang37-32
+#        apt:
+#          packages:
+#            - cmake
+#            - cmake-data
+#            - clang-3.7
+#            - linux-libc-dev:i386
+#            - g++-multilib
+#            - gcc-multilib
+#          sources:
+#            - george-edison55-precise-backports
+#            - ubuntu-toolchain-r-test
+#            - llvm-toolchain-precise-3.7
+#
+#    - env: CLANG_VERSION=3.7 BUILD_TYPE=Release ARCH=32
+#      os: linux
+#      addons: *clang37-32
+#
+#    # clang-3.7 64
+#    - env: CLANG_VERSION=3.7 BUILD_TYPE=Debug ARCH=64
+#      os: linux
+#      addons: &clang37-64
+#        apt:
+#          packages:
+#            - cmake
+#            - cmake-data
+#            - clang-3.7
+#            - g++
+#            - gcc
+#          sources:
+#            - george-edison55-precise-backports
+#            - ubuntu-toolchain-r-test
+#            - llvm-toolchain-precise-3.7
+#
+#    - env: CLANG_VERSION=3.7 BUILD_TYPE=Release ARCH=64
+#      os: linux
+#      addons: *clang37-64
+#
+#
+#    # clang-3.8 32
+#    - env: CLANG_VERSION=3.8 BUILD_TYPE=Debug ARCH=32
+#      os: linux
+#      addons: &clang38-32
+#        apt:
+#          packages:
+#            - cmake
+#            - cmake-data
+#            - clang-3.8
+#            - linux-libc-dev:i386
+#            - g++-multilib
+#            - gcc-multilib
+#          sources:
+#            - george-edison55-precise-backports
+#            - ubuntu-toolchain-r-test
+#            - llvm-toolchain-precise-3.8
+#
+#    - env: CLANG_VERSION=3.8 BUILD_TYPE=Release ARCH=32
+#      os: linux
+#      addons: *clang38-32
+#
+#    # clang-3.8 64
+#    - env: CLANG_VERSION=3.8 BUILD_TYPE=Debug ARCH=64
+#      os: linux
+#      addons: &clang38-64
+#        apt:
+#          packages:
+#            - cmake
+#            - cmake-data
+#            - clang-3.8
+#            - g++
+#            - gcc
+#          sources:
+#            - george-edison55-precise-backports
+#            - ubuntu-toolchain-r-test
+#            - llvm-toolchain-precise-3.8
+#
+#    - env: CLANG_VERSION=3.8 BUILD_TYPE=Release ARCH=64
+#      os: linux
+#      addons: *clang38-64
 
     # clang-3.9
 #    - env: CLANG_VERSION=3.9 BUILD_TYPE=Debug
@@ -154,40 +154,40 @@ matrix:
 #      addons: *clang39
 
     # gcc-4.9 32
-    - env: GCC_VERSION=4.9 BUILD_TYPE=Debug ARCH=32
-      os: linux
-      addons: &gcc49-32
-        apt:
-          packages:
-            - cmake
-            - cmake-data
-            - linux-libc-dev:i386
-            - g++-4.9-multilib
-            - gcc-4.9-multilib
-          sources:
-            - george-edison55-precise-backports
-            - ubuntu-toolchain-r-test
-    - env: GCC_VERSION=4.9 BUILD_TYPE=Release ARCH=32
-      os: linux
-      addons: *gcc49-32
-
-    # gcc-4.9 64
-    - env: GCC_VERSION=4.9 BUILD_TYPE=Debug ARCH=64
-      os: linux
-      addons: &gcc49-64
-        apt:
-          packages:
-            - cmake
-            - cmake-data
-            - g++-4.9
-            - gcc-4.9
-          sources:
-            - george-edison55-precise-backports
-            - ubuntu-toolchain-r-test
-    - env: GCC_VERSION=4.9 BUILD_TYPE=Release ARCH=64
-      os: linux
-      addons: *gcc49-64
-
+#    - env: GCC_VERSION=4.9 BUILD_TYPE=Debug ARCH=32
+#      os: linux
+#      addons: &gcc49-32
+#        apt:
+#          packages:
+#            - cmake
+#            - cmake-data
+#            - linux-libc-dev:i386
+#            - g++-4.9-multilib
+#            - gcc-4.9-multilib
+#          sources:
+#            - george-edison55-precise-backports
+#            - ubuntu-toolchain-r-test
+#    - env: GCC_VERSION=4.9 BUILD_TYPE=Release ARCH=32
+#      os: linux
+#      addons: *gcc49-32
+#
+#    # gcc-4.9 64
+#    - env: GCC_VERSION=4.9 BUILD_TYPE=Debug ARCH=64
+#      os: linux
+#      addons: &gcc49-64
+#        apt:
+#          packages:
+#            - cmake
+#            - cmake-data
+#            - g++-4.9
+#            - gcc-4.9
+#          sources:
+#            - george-edison55-precise-backports
+#            - ubuntu-toolchain-r-test
+#    - env: GCC_VERSION=4.9 BUILD_TYPE=Release ARCH=64
+#      os: linux
+#      addons: *gcc49-64
+#
     # gcc-5 32
     - env: GCC_VERSION=5 BUILD_TYPE=Debug ARCH=32
       os: linux
@@ -231,6 +231,7 @@ matrix:
           packages:
             - cmake
             - cmake-data
+            - rpm
             - linux-libc-dev:i386
             - g++-6-multilib
             - gcc-6-multilib
@@ -249,6 +250,7 @@ matrix:
           packages:
             - cmake
             - cmake-data
+            - rpm
             - g++-6
             - gcc-6
           sources:
@@ -294,10 +296,10 @@ before_script:
   - cd build
   - |
     if [[ "$GCOV" == "gcov-5" && "$BUILD_TYPE" == "Debug" ]]; then
-      cmake -DCMAKE_CXX_COMPILER=${COMPILER} -DARCH=${ARCH} -DGCOV_BINARY=${GCOV} -DCMAKE_BUILD_TYPE=Debug -DCOVERAGE=true ..;
+      cmake -DCMAKE_CXX_COMPILER=${COMPILER} -DARCH=${ARCH} -DGCOV_BINARY=${GCOV} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCOVERAGE=true ..;
       lcov --directory include --directory src --directory test --zerocounters
     else
-      cmake -DCMAKE_CXX_COMPILER=${COMPILER} -DARCH=${ARCH} -DCMAKE_BUILD_TYPE=Debug ..;
+      cmake -DCMAKE_CXX_COMPILER=${COMPILER} -DARCH=${ARCH} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ..;
     fi
 
 script:
@@ -325,13 +327,10 @@ before_deploy:
 deploy:
   provider: releases
   api_key: ${GITHUB_TOKEN}
-#  api_key:
-#    secure: "xfjHf0E/pbe7Lw67xU8b1ldPUTB2cVFF00rF350+46iSpcYYLhVZ+GAGK8NHAwq4lgHlLM9zidgRmvgG3MimxEMa96nT4EBMSnqyRIHaaeEMJWjU7EdMj4FUXnRIw7JGsM3KEAJg0QCpykWz1g11afK4XZVqcwpb+OIYj1qkpP5NPaD/6qF0u2WCsjTqQp8s0ZjCusu2xN9EMJIHmooRjGkTm4bMWVi2QMmiyaPjEyq4vbgagNnNOExhmg0VZcZAc6O+yDqfGW6wBqVBe0XB2HDNVTQ18UrA23kQCF9owddl4iUUgz21ZcUUCm/5R62xs4qZ5bxEheVZQqEA91f7tlLWhrQC6FFUIibWYErgE/YegA6+G5H+ztROK01eZvS1qqRjgT9dTSFPZqyweVtFBlazz+bPwUrI4ejv9cPc0Le3JEGKMkW1tJhNzTw/AHkIp2ThDpgHScZgLdCef3zyCBMk+a1ukezCioJyoleGkrOQguwD3MR5GH34TUBULU4EOZDrqdCOT+I666u84Px+m/L03SOcR36HFQcjyGYqBLqSJYesl18JWhO0BQGsk5k28pOnqSnQDwkakSEzSAU214lqb1eA8riy4MMmJOMT+4qNGb9qWzlx0Q46bBjexgus4GFmnRaxhoKbGP+FDDPXR+bMOKFJL/BA+B5YiPhewVQ="
   file_glob: true
   file: "${RELEASE_PKG_FILE}"
   skip_cleanup: true
   on:
-#    repo: zussel/cmake-cpp-seed
     tags: true
     condition: "GCC_VERSION == 6 && BUILD_TYPE = Release"
     all_branches: true