Merge pull request #2365 from fengzeroz/v2.11

branch v2.11
2026-10-29 23:19:18 +08:00 · 2025-01-17 17:19:23 +08:00 · 2025-01-17 09:18:36 +00:00 · 2025-01-17 16:50:52 +08:00 · 2025-01-17 08:44:09 +00:00
6 changed files with 9 additions and 9 deletions
@@ -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.11

    steps:
      - uses: actions/checkout@v4
@@ -78,7 +78,7 @@ jobs:

  pft:
    runs-on: ubuntu-20.04
-    container: ghcr.io/neugates/build:x86_64-main
+    container: ghcr.io/neugates/build:x86_64-v2.11
    strategy:
      matrix:
        plugin: [core, ekuiper, modbus, mqtt, azure, metrics]
@@ -10,7 +10,7 @@ on:
 env:
  VERSION: 2.11.0
  UI_VERSION: 2.6.1
-  BRANCH: main
+  BRANCH: v2.11

 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.11

    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.11

    steps:
      - uses: actions/checkout@v4
@@ -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.11/libs)

 set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
 set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
@@ -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.11/libs)

 set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
 set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
@@ -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.11/libs)

 set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
 set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
@@ -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.11/libs)

 set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
 set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
Author	SHA1	Message	Date
fengzeroz	36eefb2186	Merge pull request #2365 from fengzeroz/v2.11 branch v2.11	2025-01-17 17:19:23 +08:00
fengzero	2f4216d944	branch v2.11	2025-01-17 09:18:36 +00:00
fengzeroz	085d6846f0	Merge pull request #2364 from fengzeroz/v2.11 branch v2.11	2025-01-17 16:50:52 +08:00
fengzero	8186dc6ee2	branch v2.11	2025-01-17 08:44:09 +00:00