update
authorMichael Wallner <mike@php.net>
Fri, 2 Oct 2020 15:47:15 +0000 (17:47 +0200)
committerMichael Wallner <mike@php.net>
Fri, 2 Oct 2020 15:47:15 +0000 (17:47 +0200)
.github/workflows/cmake-build-ci.gen
.github/workflows/cmake-build-ci.yml
CMakeConfig.txt
README.md
codecov.yml [new file with mode: 0644]

index dd5ae2e0235ba48d1f6318d4afcfc9759cce2579..93e06dd22da6c1ab3b528497bae2f837a97eeec2 100755 (executable)
@@ -155,7 +155,7 @@ on:
 env:
   # defaults
   INSTALL_MEMCACHED:  memcached
-  CMAKE_CONFIG_TYPE:  Debug
+  CMAKE_BUILD_TYPE:   Debug
   BUILD_TESTING:      "ON"
   ENABLE_SASL:        "OFF"
   ENABLE_HASH_HSIEH:  "ON"
@@ -178,7 +178,7 @@ jobs:
     runs-on: ${{ matrix.os_ver }}
     continue-on-error: ${{ matrix.cc_vnd == 'clang' }}
     env:
-      CMAKE_CONFIG_TYPE: Release
+      CMAKE_BUILD_TYPE: Release
       OS_VND: Linux
       OS_VER: ${{ matrix.os_ver }}
       CC_VND: ${{ matrix.cc_vnd }}
@@ -206,6 +206,8 @@ jobs:
       - uses: actions/checkout@v2
 <?php steps(); ?>
       - uses: codecov/codecov-action@v1.0.13
+        with:
+          directory: build/src
 
   # memcached new
   ci-new:
index d1d8096122cd0245868233bf0b99d208c84a19c6..6d045ee1d48251187f52df243c58dd3a70a13b85 100644 (file)
@@ -14,7 +14,7 @@ on:
 env:
   # defaults
   INSTALL_MEMCACHED:  memcached
-  CMAKE_CONFIG_TYPE:  Debug
+  CMAKE_BUILD_TYPE:   Debug
   BUILD_TESTING:      "ON"
   ENABLE_SASL:        "OFF"
   ENABLE_HASH_HSIEH:  "ON"
@@ -37,7 +37,7 @@ jobs:
     runs-on: ${{ matrix.os_ver }}
     continue-on-error: ${{ matrix.cc_vnd == 'clang' }}
     env:
-      CMAKE_CONFIG_TYPE: Release
+      CMAKE_BUILD_TYPE: Release
       OS_VND: Linux
       OS_VER: ${{ matrix.os_ver }}
       CC_VND: ${{ matrix.cc_vnd }}
@@ -176,6 +176,8 @@ jobs:
         if: ${{ failure() }}
         run: cat build/Testing/Temporary/LastTest.log
       - uses: codecov/codecov-action@v1.0.13
+        with:
+          directory: build/src
 
   # memcached new
   ci-new:
index 231ebcbc31417bce44ca655db63d7b3f06662b1c..baced8881fe6d27588587c1be03b89025f0f7a1a 100644 (file)
@@ -1,5 +1,11 @@
-set(CMAKE_BUILD_TYPE Release
-    CACHE STRING "build type (Release, Debug, ...)")
+if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+    if(NOT DEFINED ENV{CMAKE_BUILD_TYPE})
+        set(ENV{CMAKE_BUILD_TYPE} Release)
+    endif()
+    set(CMAKE_BUILD_TYPE $ENV{CMAKE_BUILD_TYPE}
+        CACHE STRING "build type (Release, Debug, ...)" FORCE)
+endif()
 set(CMAKE_INSTALL_PREFIX /usr/local
     CACHE PATH "install prefix")
 
index 1f6222974078be66e0779984c5945c62d43c2577..d37343dcfb95c86b81905807eee05ab35634016f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # libmemcached
 
-[![Build Status](https://travis-ci.org/m6w6/libmemcached.svg?branch=v1.0)](https://travis-ci.org/m6w6/libmemcached) [![Join the chat at https://gitter.im/m6w6/libmemcached](https://badges.gitter.im/m6w6/libmemcached.svg)](https://gitter.im/m6w6/libmemcached?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Build Status](https://github.com/m6w6/libmemcached/workflows/cmake-build-ci/badge.svg)](https://github.com/m6w6/libmemcached/actions?query=workflow%3Acmake-build-ci) 
+[![Gitter Chat](https://badges.gitter.im/m6w6/libmemcached.svg)](https://gitter.im/m6w6/libmemcached?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 libmemcached is an open source C/C++ client library and tools for the
 memcached server (http://memcached.org/). It has been designed to be
diff --git a/codecov.yml b/codecov.yml
new file mode 100644 (file)
index 0000000..02f8278
--- /dev/null
@@ -0,0 +1,16 @@
+codecov:
+
+ignore:
+  - "/usr"
+
+coverage:
+  range: 60..90
+  round: nearest
+  precision: 0
+  notify:
+    gitter:
+      default:
+        url: "https://webhooks.gitter.im/e/a6210fd7fb7b5105b2b0"
+        threshold: 1%
+
+