GithubStar/neuron
1
0
Fork 0
mirror of https://github.com/emqx/neuron.git synced 2026-10-29 15:09:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "branch v2.16"

Browse Source 
This reverts commit 73f0f6d653.
This commit is contained in:
fengzero
2026-10-26 02:49:39 +00:00
parent de1eec7cd9
commit e6e4823f94
9 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/check.yml
+9 -9
View File
@@ -27,7 +27,7 @@ jobs:
cppcheck:
runs-on: ubuntu-24.04
container: ghcr.io/neugates/build:x86_64-v2.16
container: ghcr.io/neugates/build:x86_64-main
steps:
- uses: actions/checkout@v4
@@ -54,7 +54,7 @@ jobs:
build:
runs-on: ubuntu-24.04
container: ghcr.io/neugates/build:x86_64-v2.16
container: ghcr.io/neugates/build:x86_64-main
steps:
- uses: actions/checkout@v4
@@ -77,7 +77,7 @@ jobs:
ut:
runs-on: ubuntu-24.04
container: ghcr.io/neugates/build:x86_64-v2.16
container: ghcr.io/neugates/build:x86_64-main
needs: [build]
steps:
@@ -115,7 +115,7 @@ jobs:
pft:
runs-on: ubuntu-24.04
container: ghcr.io/neugates/build:x86_64-v2.16
container: ghcr.io/neugates/build:x86_64-main
needs: [build]
strategy:
matrix:
@@ -181,7 +181,7 @@ jobs:
pft_kafka:
runs-on: ubuntu-24.04
container: ghcr.io/neugates/build:x86_64-v2.16
container: ghcr.io/neugates/build:x86_64-main
needs: [build]
services:
kafka:
@@ -224,13 +224,13 @@ jobs:
- name: debug kafka plugin deps
run: |
echo "=== libs in staging prefix ==="
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"
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.16/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
.github/workflows/ci.yml
+4 -4
View File
@@ -8,9 +8,9 @@ on:
- published
env:
VERSION: 2.16.0
VERSION: 2.15.0
UI_VERSION: 2.6.1
BRANCH: v2.16
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.16
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.16
container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-main
steps:
- uses: actions/checkout@v4
cmake/aarch64-linux-gnu.cmake
+1 -1
View File
@@ -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.16/libs)
set(LIBRARY_DIR /home/neuron/main/libs)
set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
cmake/arm-linux-gnueabi.cmake
+1 -1
View File
@@ -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.16/libs)
set(LIBRARY_DIR /home/neuron/main/libs)
set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
cmake/arm-linux-gnueabihf.cmake
+1 -1
View File
@@ -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.16/libs)
set(LIBRARY_DIR /home/neuron/main/libs)
set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
cmake/x86_64-linux-gnu.cmake
+1 -1
View File
@@ -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.16/libs)
set(LIBRARY_DIR /home/neuron/main/libs)
set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
include/neuron/define.h
+1 -1
View File
@@ -23,7 +23,7 @@
#include <stdbool.h>
#define NEU_VERSION_MAJOR 2
#define NEU_VERSION_MINOR 16
#define NEU_VERSION_MINOR 15
#define NEU_VERSION_FIX 0
#define NEU_GET_VERSION_MAJOR(V) ((0xffff0000 & V) >> 16)
tests/plugins/c1/c1_2.c
+1 -1
View File
@@ -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(NEU_VERSION_MAJOR, NEU_VERSION_MINOR, 99),
.version = NEU_VERSION(2, 15, 99),
.schema = "c1",
.module_name = "c1",
.module_descr = "c1 v2",
version
+1 -1
View File
@@ -1 +1 @@
2.16.0-beta.1
2.15.0