From 40569f843ceca97a10683a57ecbe8eeb48c63788 Mon Sep 17 00:00:00 2001 From: fengzero Date: Thu, 29 Feb 2024 08:34:49 +0000 Subject: [PATCH] version: v2.8 --- .github/workflows/check.yml | 50 ++------------------------------- .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 +- tests/ft/plugin/test_plugin.py | 2 +- tests/plugins/c1/c1_2.c | 2 +- version | 2 +- 10 files changed, 15 insertions(+), 59 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index f72ca4ab..f5ef94af 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.8 steps: - uses: actions/checkout@v4 @@ -60,24 +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@v3 - with: - verbose: true - fail_ci_if_error: true - directory: ./cov_report/ - files: cov-ut.info - ft: runs-on: ubuntu-20.04 - container: ghcr.io/neugates/build:x86_64-main + container: ghcr.io/neugates/build:x86_64-v2.8 steps: - uses: actions/checkout@v4 @@ -105,24 +90,9 @@ jobs: path: | build/neuron.log - - name: create cov report - run: | - sudo apt-get update - sudo apt-get -y install lcov - mkdir -p cov_report - ./create_cov_report.sh ft - - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 - with: - verbose: true - fail_ci_if_error: true - directory: ./cov_report/ - files: cov-ft.info - pft: runs-on: ubuntu-20.04 - container: ghcr.io/neugates/build:x86_64-main + container: ghcr.io/neugates/build:x86_64-v2.8 strategy: matrix: plugin: [core, ekuiper, modbus, mqtt, metrics] @@ -164,17 +134,3 @@ jobs: 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@v3 - with: - verbose: true - directory: ./cov_report/ - files: cov-${{ matrix.plugin }}.info diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5e36493e..cbb5d7ce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,9 +8,9 @@ on: - published env: - VERSION: 2.7.0 + VERSION: 2.8.0 UI_VERSION: 2.6.1 - BRANCH: main + BRANCH: v2.8 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.8 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.8 steps: - uses: actions/checkout@v4 diff --git a/cmake/aarch64-linux-gnu.cmake b/cmake/aarch64-linux-gnu.cmake index 5c81eef2..ae45f52e 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.8/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..0299a681 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.8/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..d7816e63 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.8/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..cace91b4 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.8/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..431a302d 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 8 #define NEU_VERSION_FIX 0 #define NEU_GET_VERSION_MAJOR(V) ((0xffff0000 & V) >> 16) diff --git a/tests/ft/plugin/test_plugin.py b/tests/ft/plugin/test_plugin.py index 3408aaf7..9f53edc5 100644 --- a/tests/ft/plugin/test_plugin.py +++ b/tests/ft/plugin/test_plugin.py @@ -244,7 +244,7 @@ class TestPlugin: assert 200 == response.status_code for plugin in response.json().get("plugins"): if plugin['name'] == 'c1': - assert plugin['version'] == '2.7.99' + assert plugin['version'] == '2.8.99' @description(given="incorrect configuration", when="update plugin", then="fail") def test_10_update_plugin_fail3(self): diff --git a/tests/plugins/c1/c1_2.c b/tests/plugins/c1/c1_2.c index 20b5c4fb..ce85eb19 100644 --- a/tests/plugins/c1/c1_2.c +++ b/tests/plugins/c1/c1_2.c @@ -63,7 +63,7 @@ static const neu_plugin_intf_funs_t plugin_intf_funs = { }; const neu_plugin_module_t neu_plugin_module = { - .version = NEU_VERSION(2, 7, 99), + .version = NEU_VERSION(2, 8, 99), .schema = "c1", .module_name = "c1", .module_descr = "c1 v2", diff --git a/version b/version index a9d23659..fe858ecc 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.7.0-dev \ No newline at end of file +2.8.0-beta1 \ No newline at end of file