Skip to content

Commit 4c6cc8e

Browse files
author
fengzero
committed
branch v2.16
1 parent ef6b3ff commit 4c6cc8e

9 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎.github/workflows/check.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
cppcheck:
2929
runs-on: ubuntu-24.04
30-
container: ghcr.io/neugates/build:x86_64-main
30+
container: ghcr.io/neugates/build:x86_64-v2.16
3131

3232
steps:
3333
- uses: actions/checkout@v4
@@ -54,7 +54,7 @@ jobs:
5454

5555
build:
5656
runs-on: ubuntu-24.04
57-
container: ghcr.io/neugates/build:x86_64-main
57+
container: ghcr.io/neugates/build:x86_64-v2.16
5858

5959
steps:
6060
- uses: actions/checkout@v4
@@ -77,7 +77,7 @@ jobs:
7777
7878
ut:
7979
runs-on: ubuntu-24.04
80-
container: ghcr.io/neugates/build:x86_64-main
80+
container: ghcr.io/neugates/build:x86_64-v2.16
8181
needs: [build]
8282

8383
steps:
@@ -115,7 +115,7 @@ jobs:
115115

116116
pft:
117117
runs-on: ubuntu-24.04
118-
container: ghcr.io/neugates/build:x86_64-main
118+
container: ghcr.io/neugates/build:x86_64-v2.16
119119
needs: [build]
120120
strategy:
121121
matrix:
@@ -181,7 +181,7 @@ jobs:
181181

182182
pft_kafka:
183183
runs-on: ubuntu-24.04
184-
container: ghcr.io/neugates/build:x86_64-main
184+
container: ghcr.io/neugates/build:x86_64-v2.16
185185
needs: [build]
186186
services:
187187
kafka:
@@ -224,13 +224,13 @@ jobs:
224224
- name: debug kafka plugin deps
225225
run: |
226226
echo "=== libs in staging prefix ==="
227-
ls -la /home/neuron/main/libs/x86_64-linux-gnu/lib/librdkafka* || echo "no librdkafka"
228-
ls -la /home/neuron/main/libs/x86_64-linux-gnu/lib/libzstd* || echo "no libzstd"
229-
ls -la /home/neuron/main/libs/x86_64-linux-gnu/lib/libsasl2* || echo "no libsasl2"
227+
ls -la /home/neuron/v2.16/libs/x86_64-linux-gnu/lib/librdkafka* || echo "no librdkafka"
228+
ls -la /home/neuron/v2.16/libs/x86_64-linux-gnu/lib/libzstd* || echo "no libzstd"
229+
ls -la /home/neuron/v2.16/libs/x86_64-linux-gnu/lib/libsasl2* || echo "no libsasl2"
230230
echo "=== libs in /usr/local/lib ==="
231231
ls -la /usr/local/lib/librdkafka* /usr/local/lib/libzstd* /usr/local/lib/libsasl2* 2>/dev/null || echo "none yet"
232232
echo "=== ldd librdkafka from staging ==="
233-
ldd /home/neuron/main/libs/x86_64-linux-gnu/lib/librdkafka.so.1 || true
233+
ldd /home/neuron/v2.16/libs/x86_64-linux-gnu/lib/librdkafka.so.1 || true
234234
echo "=== ldd plugin-kafka from build ==="
235235
chmod -R +x ./build/ 2>/dev/null || true
236236
ldd ./build/plugins/libplugin-kafka.so || true

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ on:
88
- published
99

1010
env:
11-
VERSION: 2.15.0
11+
VERSION: 2.16.0
1212
UI_VERSION: 2.6.1
13-
BRANCH: main
13+
BRANCH: v2.16
1414

1515
jobs:
1616
cross-build:
@@ -19,7 +19,7 @@ jobs:
1919
matrix:
2020
arch:
2121
- [x86_64-linux-gnu, x86_64, amd64]
22-
container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-main
22+
container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-v2.16
2323

2424
steps:
2525
- uses: actions/checkout@v4
@@ -62,7 +62,7 @@ jobs:
6262
matrix:
6363
arch:
6464
- [x86_64-linux-gnu, x86_64, amd64]
65-
container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-main
65+
container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-v2.16
6666

6767
steps:
6868
- uses: actions/checkout@v4

‎cmake/aarch64-linux-gnu.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
set(CMAKE_SYSTEM_NAME Linux)
22
set(COMPILER_PREFIX aarch64-linux-gnu)
33
set(CMAKE_SYSTEM_PROCESSOR aarch64)
4-
set(LIBRARY_DIR /home/neuron/main/libs)
4+
set(LIBRARY_DIR /home/neuron/v2.16/libs)
55

66
set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
77
set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)

‎cmake/arm-linux-gnueabi.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
set(CMAKE_SYSTEM_NAME Linux)
22
set(COMPILER_PREFIX arm-linux-gnueabi)
33
set(CMAKE_SYSTEM_PROCESSOR armv5tejl)
4-
set(LIBRARY_DIR /home/neuron/main/libs)
4+
set(LIBRARY_DIR /home/neuron/v2.16/libs)
55

66
set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
77
set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)

‎cmake/arm-linux-gnueabihf.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
set(CMAKE_SYSTEM_NAME Linux)
22
set(COMPILER_PREFIX arm-linux-gnueabihf)
33
set(CMAKE_SYSTEM_PROCESSOR armv7l)
4-
set(LIBRARY_DIR /home/neuron/main/libs)
4+
set(LIBRARY_DIR /home/neuron/v2.16/libs)
55

66
set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
77
set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)

‎cmake/x86_64-linux-gnu.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
set(CMAKE_SYSTEM_NAME Linux)
22
set(COMPILER_PREFIX x86_64-linux-gnu)
33
set(CMAKE_SYSTEM_PROCESSOR x86_64)
4-
set(LIBRARY_DIR /home/neuron/main/libs)
4+
set(LIBRARY_DIR /home/neuron/v2.16/libs)
55

66
set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
77
set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)

‎include/neuron/define.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <stdbool.h>
2424

2525
#define NEU_VERSION_MAJOR 2
26-
#define NEU_VERSION_MINOR 15
26+
#define NEU_VERSION_MINOR 16
2727
#define NEU_VERSION_FIX 0
2828

2929
#define NEU_GET_VERSION_MAJOR(V) ((0xffff0000 & V) >> 16)

‎tests/plugins/c1/c1_2.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ static const neu_plugin_intf_funs_t plugin_intf_funs = {
6363
};
6464

6565
const neu_plugin_module_t neu_plugin_module = {
66-
.version = NEU_VERSION(2, 15, 99),
66+
.version = NEU_VERSION(2, 16, 99),
6767
.schema = "c1",
6868
.module_name = "c1",
6969
.module_descr = "c1 v2",

‎version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.15.0
1+
2.16.0-beta.1

0 commit comments

Comments
 (0)