From: Michael Wallner <mike@php.net>
Date: Fri, 2 Oct 2020 15:47:15 +0000 (+0200)
Subject: update
X-Git-Tag: 1.1.0-beta1~236^2~22^2~18
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=ec783a984d98aac9265b98db6ef65bfeff216afc;p=m6w6%2Flibmemcached

update
---

diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen
index dd5ae2e0..93e06dd2 100755
--- a/.github/workflows/cmake-build-ci.gen
+++ b/.github/workflows/cmake-build-ci.gen
@@ -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:
diff --git a/.github/workflows/cmake-build-ci.yml b/.github/workflows/cmake-build-ci.yml
index d1d80961..6d045ee1 100644
--- a/.github/workflows/cmake-build-ci.yml
+++ b/.github/workflows/cmake-build-ci.yml
@@ -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:
diff --git a/CMakeConfig.txt b/CMakeConfig.txt
index 231ebcbc..baced888 100644
--- a/CMakeConfig.txt
+++ b/CMakeConfig.txt
@@ -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")
 
diff --git a/README.md b/README.md
index 1f622297..d37343dc 100644
--- 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
index 00000000..02f82786
--- /dev/null
+++ b/codecov.yml
@@ -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%
+
+