From 8871063e24a37071c2f1d11fa284a389de2d8ce4 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Tue, 20 Oct 2020 11:48:43 +0200 Subject: [PATCH] merge cov into new build --- .github/workflows/cmake-build-ci.gen | 15 ++----- .github/workflows/cmake-build-ci.yml | 66 ++-------------------------- 2 files changed, 6 insertions(+), 75 deletions(-) diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen index d8b46d42..d3e6829d 100755 --- a/.github/workflows/cmake-build-ci.gen +++ b/.github/workflows/cmake-build-ci.gen @@ -223,6 +223,8 @@ jobs: INSTALL_MEMCACHED: MEMCACHED_PREFIX: /tmp ENABLE_SASL: "ON" + CFLAGS: "-O0 --coverage" + CXXFLAGS: "-O0 --coverage" steps: - uses: actions/checkout@v2 - uses: actions/checkout@v2 @@ -231,6 +233,7 @@ jobs: path: memcached ref: 1.6.7 + - uses: codecov/codecov-action@v1.0.13 # sanitizer build dbg-san: @@ -242,18 +245,6 @@ jobs: - uses: actions/checkout@v2 - # coverage build - dbg-cov: - name: dbg-cov () - runs-on: # - env: - CFLAGS: -O0 --coverage - CXXFLAGS: -O0 --coverage - steps: - - uses: actions/checkout@v2 - - - uses: codecov/codecov-action@v1.0.13 - # mac build dbg-mac: name: dbg-mac (, , ) diff --git a/.github/workflows/cmake-build-ci.yml b/.github/workflows/cmake-build-ci.yml index b6cc23dc..390998ad 100644 --- a/.github/workflows/cmake-build-ci.yml +++ b/.github/workflows/cmake-build-ci.yml @@ -37,6 +37,8 @@ jobs: INSTALL_MEMCACHED: MEMCACHED_PREFIX: /tmp ENABLE_SASL: "ON" + CFLAGS: "-O0 --coverage" + CXXFLAGS: "-O0 --coverage" steps: - uses: actions/checkout@v2 - uses: actions/checkout@v2 @@ -96,6 +98,7 @@ jobs: - name: Failed tests log if: ${{ failure() }} run: cat build/Testing/Temporary/LastTest.log || true + - uses: codecov/codecov-action@v1.0.13 # sanitizer build dbg-san: @@ -158,69 +161,6 @@ jobs: if: ${{ failure() }} run: cat build/Testing/Temporary/LastTest.log || true - # coverage build - dbg-cov: - name: dbg-cov (ubuntu-20.04, gnu, cur) - runs-on: ubuntu-20.04 # - env: - CFLAGS: -O0 --coverage - CXXFLAGS: -O0 --coverage - steps: - - uses: actions/checkout@v2 - - name: Prepare environment (for cur gnu on ubuntu-20.04) - if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='gnu') && (env.CC_VER=='cur') - run: | - echo CC="gcc-9" >> ${GITHUB_ENV} - echo CXX="g++-9" >> ${GITHUB_ENV} - - name: Install dependencies (Linux) - if: runner.os == 'Linux' - run: | - sudo apt-get install \ - libevent-dev \ - libsasl2-dev \ - ${INSTALL_MEMCACHED} \ - ${INSTALL_CC} ${INSTALL_CXX} - sudo systemctl stop memcached || true - - name: Install dependencies (Mac) - if: runner.os == 'macOS' - run: | - brew install bison flex ${INSTALL_MEMCACHED} - brew services stop memcached || true - echo MEMCACHED_BINARY="/usr/local/bin/memcached" >> ${GITHUB_ENV} - - name: Build memcached - run: | - if test -d memcached - then - cd memcached - ./autogen.sh - ./configure CFLAGS="-O2 -pipe" \ - --prefix=${MEMCACHED_PREFIX} \ - --enable-sasl \ - --enable-sasl-pwdb \ - --disable-coverage \ - --disable-dependency-tracking \ - --disable-docs \ - --disable-extstore \ - --disable-option-checking \ - ; - make -j2 - make install - cd .. - echo MEMCACHED_BINARY="${MEMCACHED_PREFIX}/bin/memcached" >> ${GITHUB_ENV} - fi - - name: Generate build tree (${{ env.CMAKE_BUILD_TYPE }}) - run: cmake -S . -B build - - name: Build all with ${{ env.CXX }} ${{ env.CXXFLAGS }} - run: make -C build -j2 all - - name: Test - run: make -C build -j2 test - - name: Install - run: make -C build -j2 install DESTDIR=/tmp - - name: Failed tests log - if: ${{ failure() }} - run: cat build/Testing/Temporary/LastTest.log || true - - uses: codecov/codecov-action@v1.0.13 - # mac build dbg-mac: name: dbg-mac (macos-10.15, clang, apple) -- 2.30.2