From 22339ee248131b52ee54c6550a7f7d03f00a4481 Mon Sep 17 00:00:00 2001 From: fengzero Date: Fri, 17 May 2024 03:03:37 +0000 Subject: [PATCH] branch v2.9 --- .github/workflows/check.yml | 38 +++------------------------------ .github/workflows/ci.yml | 8 +++---- cmake/aarch64-linux-gnu.cmake | 2 +- cmake/arm-linux-gnueabi.cmake | 2 +- cmake/arm-linux-gnueabihf.cmake | 2 +- cmake/x86_64-linux-gnu.cmake | 2 +- include/neuron/define.h | 2 +- version | 2 +- 8 files changed, 13 insertions(+), 45 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index a7487af0..43c2a38b 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -41,7 +41,7 @@ jobs: ut: runs-on: ubuntu-20.04 - container: ghcr.io/neugates/build:x86_64-main + container: ghcr.io/neugates/build:x86_64-v2.9 steps: - uses: actions/checkout@v4 @@ -60,25 +60,9 @@ jobs: cd build ctest --output-on-failure - - name: create cov report - run: | - sudo apt-get update - sudo apt-get -y install lcov - mkdir -p cov_report - ./create_cov_report.sh ut - - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v4 - with: - verbose: true - fail_ci_if_error: true - token: ${{ secrets.CODECOV_TOKEN }} - directory: ./cov_report/ - files: ./cov_report/cov-ut.info - pft: runs-on: ubuntu-20.04 - container: ghcr.io/neugates/build:x86_64-main + container: ghcr.io/neugates/build:x86_64-v2.9 strategy: matrix: plugin: [core, ekuiper, modbus, mqtt, azure, metrics] @@ -122,20 +106,4 @@ jobs: pytest -s -v tests/ft/app/"test_azure.py" else pytest -s -v tests/ft/metrics/"test_metrics.py" - fi - - - name: create cov report - run: | - sudo apt-get update - sudo apt-get -y install lcov - mkdir -p cov_report - ./create_cov_report.sh ${{ matrix.plugin }} - - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v4 - with: - verbose: true - fail_ci_if_error: true - token: ${{ secrets.CODECOV_TOKEN }} - directory: ./cov_report/ - files: ./cov_report/cov-${{ matrix.plugin }}.info + fi \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5e36493e..81666815 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,9 +8,9 @@ on: - published env: - VERSION: 2.7.0 + VERSION: 2.9.0 UI_VERSION: 2.6.1 - BRANCH: main + BRANCH: v2.9 jobs: cross-build: @@ -21,7 +21,7 @@ jobs: - [aarch64-linux-gnu, aarch64, arm64] - [arm-linux-gnueabihf, armv4, armhf] - [x86_64-linux-gnu, x86_64, amd64] - container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-main + container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-v2.9 steps: - uses: actions/checkout@v4 @@ -64,7 +64,7 @@ jobs: matrix: arch: - [x86_64-linux-gnu, x86_64, amd64] - container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-main + container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-v2.9 steps: - uses: actions/checkout@v4 diff --git a/cmake/aarch64-linux-gnu.cmake b/cmake/aarch64-linux-gnu.cmake index 5c81eef2..814973e0 100644 --- a/cmake/aarch64-linux-gnu.cmake +++ b/cmake/aarch64-linux-gnu.cmake @@ -1,7 +1,7 @@ set(CMAKE_SYSTEM_NAME Linux) set(COMPILER_PREFIX aarch64-linux-gnu) set(CMAKE_SYSTEM_PROCESSOR aarch64) -set(LIBRARY_DIR /home/neuron/main/libs) +set(LIBRARY_DIR /home/neuron/v2.9/libs) set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc) set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++) diff --git a/cmake/arm-linux-gnueabi.cmake b/cmake/arm-linux-gnueabi.cmake index 812143e6..8d3fb3cf 100644 --- a/cmake/arm-linux-gnueabi.cmake +++ b/cmake/arm-linux-gnueabi.cmake @@ -1,7 +1,7 @@ set(CMAKE_SYSTEM_NAME Linux) set(COMPILER_PREFIX arm-linux-gnueabi) set(CMAKE_SYSTEM_PROCESSOR armv5tejl) -set(LIBRARY_DIR /home/neuron/main/libs) +set(LIBRARY_DIR /home/neuron/v2.9/libs) set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc) set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++) diff --git a/cmake/arm-linux-gnueabihf.cmake b/cmake/arm-linux-gnueabihf.cmake index 203b119c..96ce9feb 100644 --- a/cmake/arm-linux-gnueabihf.cmake +++ b/cmake/arm-linux-gnueabihf.cmake @@ -1,7 +1,7 @@ set(CMAKE_SYSTEM_NAME Linux) set(COMPILER_PREFIX arm-linux-gnueabihf) set(CMAKE_SYSTEM_PROCESSOR armv7l) -set(LIBRARY_DIR /home/neuron/main/libs) +set(LIBRARY_DIR /home/neuron/v2.9/libs) set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc) set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++) diff --git a/cmake/x86_64-linux-gnu.cmake b/cmake/x86_64-linux-gnu.cmake index 98866b69..20c7cd67 100644 --- a/cmake/x86_64-linux-gnu.cmake +++ b/cmake/x86_64-linux-gnu.cmake @@ -1,7 +1,7 @@ set(CMAKE_SYSTEM_NAME Linux) set(COMPILER_PREFIX x86_64-linux-gnu) set(CMAKE_SYSTEM_PROCESSOR x86_64) -set(LIBRARY_DIR /home/neuron/main/libs) +set(LIBRARY_DIR /home/neuron/v2.9/libs) set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc) set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++) diff --git a/include/neuron/define.h b/include/neuron/define.h index fe016a52..fa3d61ed 100644 --- a/include/neuron/define.h +++ b/include/neuron/define.h @@ -23,7 +23,7 @@ #include #define NEU_VERSION_MAJOR 2 -#define NEU_VERSION_MINOR 7 +#define NEU_VERSION_MINOR 9 #define NEU_VERSION_FIX 0 #define NEU_GET_VERSION_MAJOR(V) ((0xffff0000 & V) >> 16) diff --git a/version b/version index a9d23659..eae24199 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.7.0-dev \ No newline at end of file +2.9.0-alpha1 \ No newline at end of file