Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

cppcheck:
runs-on: ubuntu-24.04
container: ghcr.io/neugates/build:x86_64-main
container: ghcr.io/neugates/build:x86_64-v2.16

steps:
- uses: actions/checkout@v4
Expand All @@ -54,7 +54,7 @@ jobs:

build:
runs-on: ubuntu-24.04
container: ghcr.io/neugates/build:x86_64-main
container: ghcr.io/neugates/build:x86_64-v2.16

steps:
- uses: actions/checkout@v4
Expand All @@ -77,7 +77,7 @@ jobs:

ut:
runs-on: ubuntu-24.04
container: ghcr.io/neugates/build:x86_64-main
container: ghcr.io/neugates/build:x86_64-v2.16
needs: [build]

steps:
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:

pft:
runs-on: ubuntu-24.04
container: ghcr.io/neugates/build:x86_64-main
container: ghcr.io/neugates/build:x86_64-v2.16
needs: [build]
strategy:
matrix:
Expand Down Expand Up @@ -181,7 +181,7 @@ jobs:

pft_kafka:
runs-on: ubuntu-24.04
container: ghcr.io/neugates/build:x86_64-main
container: ghcr.io/neugates/build:x86_64-v2.16
needs: [build]
services:
kafka:
Expand Down Expand Up @@ -224,13 +224,13 @@ jobs:
- name: debug kafka plugin deps
run: |
echo "=== libs in staging prefix ==="
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"
ls -la /home/neuron/v2.16/libs/x86_64-linux-gnu/lib/librdkafka* || echo "no librdkafka"
ls -la /home/neuron/v2.16/libs/x86_64-linux-gnu/lib/libzstd* || echo "no libzstd"
ls -la /home/neuron/v2.16/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/main/libs/x86_64-linux-gnu/lib/librdkafka.so.1 || true
ldd /home/neuron/v2.16/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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ on:
- published

env:
VERSION: 2.15.0
VERSION: 2.16.0
UI_VERSION: 2.6.1
BRANCH: main
BRANCH: v2.16

jobs:
cross-build:
Expand All @@ -19,7 +19,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.16

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -62,7 +62,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.16

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion cmake/aarch64-linux-gnu.cmake
Original file line number Diff line number Diff line change
@@ -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.16/libs)

set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
Expand Down
2 changes: 1 addition & 1 deletion cmake/arm-linux-gnueabi.cmake
Original file line number Diff line number Diff line change
@@ -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.16/libs)

set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
Expand Down
2 changes: 1 addition & 1 deletion cmake/arm-linux-gnueabihf.cmake
Original file line number Diff line number Diff line change
@@ -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.16/libs)

set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
Expand Down
2 changes: 1 addition & 1 deletion cmake/x86_64-linux-gnu.cmake
Original file line number Diff line number Diff line change
@@ -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.16/libs)

set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
Expand Down
2 changes: 1 addition & 1 deletion include/neuron/define.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <stdbool.h>

#define NEU_VERSION_MAJOR 2
#define NEU_VERSION_MINOR 15
#define NEU_VERSION_MINOR 16
#define NEU_VERSION_FIX 0

#define NEU_GET_VERSION_MAJOR(V) ((0xffff0000 & V) >> 16)
Expand Down
2 changes: 1 addition & 1 deletion tests/ft/plugin/test_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ def test_09_update_plugin_success0(self):
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.16.99'

@description(given="incorrect configuration", when="update plugin", then="fail")
def test_10_update_plugin_fail3(self):
Expand Down
2 changes: 1 addition & 1 deletion tests/plugins/c1/c1_2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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, 16, 99),
.schema = "c1",
.module_name = "c1",
.module_descr = "c1 v2",
Expand Down
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.15.0
2.16.0-beta.1
Loading