diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 488f7131..92caf59c 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -27,7 +27,7 @@ jobs: cppcheck: runs-on: ubuntu-24.04 - container: ghcr.io/neugates/build:x86_64-v2.15 + container: ghcr.io/neugates/build:x86_64-main steps: - uses: actions/checkout@v4 @@ -42,7 +42,7 @@ jobs: build: runs-on: ubuntu-24.04 - container: ghcr.io/neugates/build:x86_64-v2.15 + container: ghcr.io/neugates/build:x86_64-main steps: - uses: actions/checkout@v4 @@ -65,7 +65,7 @@ jobs: ut: runs-on: ubuntu-24.04 - container: ghcr.io/neugates/build:x86_64-v2.15 + container: ghcr.io/neugates/build:x86_64-main needs: [build] steps: @@ -103,7 +103,7 @@ jobs: pft: runs-on: ubuntu-24.04 - container: ghcr.io/neugates/build:x86_64-v2.15 + container: ghcr.io/neugates/build:x86_64-main needs: [build] strategy: matrix: @@ -169,7 +169,7 @@ jobs: pft_kafka: runs-on: ubuntu-24.04 - container: ghcr.io/neugates/build:x86_64-v2.15 + container: ghcr.io/neugates/build:x86_64-main needs: [build] services: kafka: @@ -212,13 +212,13 @@ jobs: - name: debug kafka plugin deps run: | echo "=== libs in staging prefix ===" - ls -la /home/neuron/v2.15/libs/x86_64-linux-gnu/lib/librdkafka* || echo "no librdkafka" - ls -la /home/neuron/v2.15/libs/x86_64-linux-gnu/lib/libzstd* || echo "no libzstd" - ls -la /home/neuron/v2.15/libs/x86_64-linux-gnu/lib/libsasl2* || echo "no libsasl2" + ls -la /home/neuron/main/libs/x86_64-linux-gnu/lib/librdkafka* || echo "no librdkafka" + ls -la /home/neuron/main/libs/x86_64-linux-gnu/lib/libzstd* || echo "no libzstd" + ls -la /home/neuron/main/libs/x86_64-linux-gnu/lib/libsasl2* || echo "no libsasl2" echo "=== libs in /usr/local/lib ===" ls -la /usr/local/lib/librdkafka* /usr/local/lib/libzstd* /usr/local/lib/libsasl2* 2>/dev/null || echo "none yet" echo "=== ldd librdkafka from staging ===" - ldd /home/neuron/v2.15/libs/x86_64-linux-gnu/lib/librdkafka.so.1 || true + ldd /home/neuron/main/libs/x86_64-linux-gnu/lib/librdkafka.so.1 || true echo "=== ldd plugin-kafka from build ===" chmod -R +x ./build/ 2>/dev/null || true ldd ./build/plugins/libplugin-kafka.so || true diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1bf09b43..dd891c76 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,9 +8,9 @@ on: - published env: - VERSION: 2.15.0 + VERSION: 2.14.0 UI_VERSION: 2.6.1 - BRANCH: v2.15 + BRANCH: main jobs: cross-build: @@ -19,7 +19,7 @@ jobs: matrix: arch: - [x86_64-linux-gnu, x86_64, amd64] - container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-v2.15 + container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-main steps: - uses: actions/checkout@v4 @@ -62,7 +62,7 @@ jobs: matrix: arch: - [x86_64-linux-gnu, x86_64, amd64] - container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-v2.15 + container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-main steps: - uses: actions/checkout@v4 diff --git a/cmake/aarch64-linux-gnu.cmake b/cmake/aarch64-linux-gnu.cmake index d8840e94..cafc723a 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/v2.15/libs) +set(LIBRARY_DIR /home/neuron/main/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 7634b9f0..4fc7c43c 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/v2.15/libs) +set(LIBRARY_DIR /home/neuron/main/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 19b9ab7a..d088767c 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/v2.15/libs) +set(LIBRARY_DIR /home/neuron/main/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 f5d5d65e..4c8ed6cf 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/v2.15/libs) +set(LIBRARY_DIR /home/neuron/main/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 c7f9f3ab..fca9a891 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 15 +#define NEU_VERSION_MINOR 14 #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 df02df23..78ffcb3e 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.15.99' + assert plugin['version'] == '2.14.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 4b7f5900..13314c12 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, 15, 99), + .version = NEU_VERSION(2, 14, 99), .schema = "c1", .module_name = "c1", .module_descr = "c1 v2", diff --git a/version b/version index 4219e56a..af819700 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.15.0-beta1 +2.14.0-alpha \ No newline at end of file