From 802aeb5f48ba7ca9e2ea22c73dfd57ace949f09c Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Mon, 21 Dec 2020 11:37:19 +0100 Subject: [PATCH] travis.org is dead --- .travis.yml | 82 ----------------------------------- CPack.txt | 6 ++- ChangeLog-1.1.md | 2 +- README.md | 12 ++--- docs/source/ChangeLog-1.1.rst | 5 ++- 5 files changed, 15 insertions(+), 92 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 58112eb1..00000000 --- a/.travis.yml +++ /dev/null @@ -1,82 +0,0 @@ -os: linux -dist: focal -language: cpp - -jobs: - include: - - arch: arm64-graviton2 - virt: lxd - group: edge - - arch: arm64 - - arch: ppc64le - - arch: s390x - -branches: - only: - - v1.x - - travis - -addons: - apt: - packages: - - libevent-dev - - libsasl2-dev - - libtbb-dev - -env: - - CMAKE_BUILD_TYPE=Debug BUILD_TESTING=true ENABLE_SASL=true ENABLE_HASH_HSIEH=true CFLAGS="-O0 --coverage" CXXFLAGS="-O0 --coverage" - - CMAKE_BUILD_TYPE=Release ENABLE_SASL=true ENABLE_HASH_HSIEH=true - -install: - - | - if test $CMAKE_BUILD_TYPE == Debug - then - git clone --depth 1 -b 1.6.7 https://github.com/memcached/memcached - cd memcached - ./autogen.sh - CFLAGS="-O2 -pipe" ./configure \ - --prefix=/opt \ - --disable-coverage \ - --disable-docs \ - --disable-dependency-tracking \ - --enable-sasl \ - --enable-sasl-pwdb \ - ; - make -j2 - make install - cd .. - fi - -before_script: - - mkdir build - -script: - - | - cd build - if test $CMAKE_BUILD_TYPE == Debug - then - cmake -DMEMCACHED_BINARY=/opt/bin/memcached .. - make -j2 VERBOSE=1 - make test VERBOSE=1 - make install DESTDIR=/tmp - else - cmake .. - make -j2 - make package - cmake -DCPACK_COMPONENT_INSTALL=ON . - make package - fi - -after_failure: - - test $CMAKE_BUILD_TYPE == Debug && cat Testing/Temporary/LastTest.log || true - -after_success: - - test $CMAKE_BUILD_TYPE == Debug && bash <(curl -s https://codecov.io/bash) - -notifications: - webhooks: - urls: - - https://webhooks.gitter.im/e/796c8423962228333c54 - on_success: always - on_failure: change - on_start: never diff --git a/CPack.txt b/CPack.txt index 247daa21..c33a7dac 100644 --- a/CPack.txt +++ b/CPack.txt @@ -38,7 +38,11 @@ set(CPACK_PACKAGE_DESCRIPTION memcached server (http://memcached.org/). It has been designed to be light on memory usage, thread safe, and provide full access to server side methods.") -list(JOIN PROJECT_CONFIG "-" CPACK_PACKAGE_DIRECTORY) +if(CMAKE_VERSION VERSION_LESS 3.12) + string(REPLACE ";" "-" CPACK_PACKAGE_DIRECTORY "${PROJECT_CONFIG}") +else() + list(JOIN PROJECT_CONFIG "-" CPACK_PACKAGE_DIRECTORY) +endif() set(CPACK_PROJECT_CONFIG_FILE "${CMAKE_SOURCE_DIR}/CPack/ProjectConfig.txt") set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md") set(CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}/${PROJECT_VERSION}") diff --git a/ChangeLog-1.1.md b/ChangeLog-1.1.md index 465a3443..4d65541c 100644 --- a/ChangeLog-1.1.md +++ b/ChangeLog-1.1.md @@ -18,8 +18,8 @@ was incremented due to the following changes: * Documentation: https://m6w6.github.io/libmemcached * Continuous Integration: * Github: https://github.com/m6w6/libmemcached/actions (Linux, MacOS, Windows **·** amd64) - * Travis: https://travis-ci.org/m6w6/libmemcached (Linux **·** arm64, ppc64le, s390x) * Sourcehut: https://builds.sr.ht/~m6w6/libmemcached (FreeBSD, OpenBSD **·** amd64) + * Build artifacts: https://artifacts.m6w6.name/libmemcached/ rsync://m6w6.name::artifacts/libmemcached/ * Fix build failure due to comparison of incompatible types in bin/memflush and bin/memstat. diff --git a/README.md b/README.md index 808ade61..734f98a5 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,11 @@ Please see/edit [`CMakeConfig.txt`](./CMakeConfig.txt) or use `ccmake(1)` or * libevent (required for: contrib/bin/memaslap) * Cyrus' libsasl2 (required for: libmemacached/sasl) +### Binaries + +CI and release builds for Linux, a couple BSDs, MacOS and Windows are available at +https://artifacts.m6w6.name/libmemcached/ and rsync://m6w6.name::artifacts/libmemcached/. + ## Testing [![Codecov Badge]](https://codecov.io/gh/m6w6/libmemcached) @@ -77,13 +82,9 @@ Enable the `BUILD_TESTING` setting for a build and run `make test`. ### Continuous integration -[![Travis Badge]](https://travis-ci.org/github/m6w6/libmemcached) [![Actions Badge]](https://github.com/m6w6/libmemcached/actions?query=workflow%3Acmake-build-ci) [![Sourcehut Badge]](https://builds.sr.ht/~m6w6/libmemcached) -[Travis Badge]: - https://api.travis-ci.org/m6w6/libmemcached.svg?branch=v1.x - "Travis CI" [Actions Badge]: https://github.com/m6w6/libmemcached/workflows/cmake-build-ci/badge.svg?branch=v1.x "Github Actions" @@ -95,11 +96,10 @@ CI/Testing is performed on the following system matrix: | OS | Compiler | Arch | Comments | |------------------|------------------------------|-------------------------|----------------------------| -| Linux | GNU 9 | aarch64, ppc64le, s390x | sasl, coverage, graviton2 | | Linux | GNU 7/8/9/10, Clang 6/8/9/10 | amd64 | sasl, coverage, sanitizers | | MacOS | AppleClang 12 | amd64 | sasl, coverage | | FreeBSD, OpenBSD | Clang 8 | amd64 | sasl, coverage | -| Windows | MSVC 16 | amd64 | no sasl, no tests | +| Windows | MSVC 16, MinGW | amd64 | no sasl, no tests | | Solaris | SunPro 12.5 | amd64 | no sasl, no tests, manually| libmemcached has been tested against [memcached](https://github.com/memcached/memcached) v1.5 and v1.6. diff --git a/docs/source/ChangeLog-1.1.rst b/docs/source/ChangeLog-1.1.rst index 42de1de6..6b4be2c5 100644 --- a/docs/source/ChangeLog-1.1.rst +++ b/docs/source/ChangeLog-1.1.rst @@ -22,15 +22,16 @@ was incremented due to the following changes: * Ported test suite to Catch2. * Build requires C++11 compiler support. * Tests require C++17 compiler support. +* Moved to the Semantic Versioning Specification: https://semver.org * Moved the project from launchpad to github: * Source: https://github.com/m6w6/libmemcached * Documentation: https://m6w6.github.io/libmemcached * Continuous Integration: - * Github: https://github.com/m6w6/libmemcached/actions (Linux, MacOS **·** amd64) - * Travis: https://travis-ci.org/m6w6/libmemcached (Linux **·** arm64, ppc64le, s390x) + * Github: https://github.com/m6w6/libmemcached/actions (Linux, MacOS, Windows **·** amd64) * Sourcehut: https://builds.sr.ht/~m6w6/libmemcached (FreeBSD, OpenBSD **·** amd64) + * Build artifacts: https://artifacts.m6w6.name/libmemcached/ rsync://m6w6.name::artifacts/libmemcached/ * Fix build failure due to comparison of incompatible types in bin/memflush and bin/memstat. -- 2.30.2