From 3570d56d9edead11d87b360460d0370151142ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Korina=20=C5=A0imi=C4=8Devi=C4=87?= Date: Thu, 16 May 2024 12:13:19 +0200 Subject: [PATCH] Update versions of CI & coverage github actions Summary: related to T13767 Upgraded github actions to versions that run on node 20 (v4). Previous versions run on node 16 and are deprecated. https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/ Reviewers: ivica Reviewed By: ivica Subscribers: miljen, iljazovic Differential Revision: https://repo.mireo.local/D29494 --- .github/workflows/ci.yml | 4 ++-- .github/workflows/coverage.yml | 18 ++++++++++-------- CMakeLists.txt | 2 +- cmake/install-rules.cmake | 2 +- codecov.yml | 4 ++++ 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4949064..3c1ff4c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,7 +53,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup OpenSSL env: @@ -196,7 +196,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup container environment if: matrix.container diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 3d4ebcd..5c78b2b 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -19,7 +19,6 @@ jobs: include: - toolset: coverage compiler: g++-11 - install: g++-11 os: ubuntu-latest container: ubuntu:22.04 cxxstd: 20 @@ -33,16 +32,16 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup container environment if: matrix.container run: | apt-get update - apt-get -y install sudo wget tar cmake openssl libssl-dev pkg-config lcov + apt-get -y install sudo wget tar cmake openssl libssl-dev pkg-config lcov gpg git - name: Install compiler - run: sudo apt-get install -y ${{ matrix.install }} + run: sudo apt-get install -y ${{ matrix.compiler }} - name: Setup Boost run: | @@ -76,9 +75,12 @@ jobs: lcov --remove coverage.info '**/boost/*' --output-file coverage.info - name: Upload coverage reports to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: - files: coverage.info + verbose: true + file: coverage.info + disable_search: true fail_ci_if_error: true - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + plugin: noop + token: ${{ secrets.CODECOV_TOKEN }} + diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c684bb..91b38de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.15) -project(async-mqtt5 VERSION 0.0.1 LANGUAGES CXX) +project(async-mqtt5 VERSION 1.0.1 LANGUAGES CXX) include(cmake/project-is-top-level.cmake) include(cmake/variables.cmake) diff --git a/cmake/install-rules.cmake b/cmake/install-rules.cmake index 8f62a8f..b698e26 100644 --- a/cmake/install-rules.cmake +++ b/cmake/install-rules.cmake @@ -1,6 +1,6 @@ if(PROJECT_IS_TOP_LEVEL) set( - CMAKE_INSTALL_INCLUDEDIR "include/async-mqtt5-${PROJECT_VERSION}" + CMAKE_INSTALL_INCLUDEDIR "/async-mqtt5-${PROJECT_VERSION}" CACHE STRING "" ) set_property(CACHE CMAKE_INSTALL_INCLUDEDIR PROPERTY TYPE PATH) diff --git a/codecov.yml b/codecov.yml index 09793f6..e36319d 100644 --- a/codecov.yml +++ b/codecov.yml @@ -19,5 +19,9 @@ coverage: project: default: informational: true + github_checks: annotations: true + +fixes: + - ".*/async_mqtt5/::include/async_mqtt5/"