Skip to content

Commit 904a8dd

Browse files
authored
Merge pull request #2217 from fengzeroz/v2.10
branch v2.10
2 parents ae693ad + 94bf6a0 commit 904a8dd

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

.github/workflows/check.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
4242
ut:
4343
runs-on: ubuntu-20.04
44-
container: ghcr.io/neugates/build:x86_64-main
44+
container: ghcr.io/neugates/build:x86_64-v2.10
4545

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

7979
pft:
8080
runs-on: ubuntu-20.04
81-
container: ghcr.io/neugates/build:x86_64-main
81+
container: ghcr.io/neugates/build:x86_64-v2.10
8282
strategy:
8383
matrix:
8484
plugin: [core, ekuiper, modbus, mqtt, azure, metrics]

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
env:
1111
VERSION: 2.10.0
1212
UI_VERSION: 2.6.1
13-
BRANCH: main
13+
BRANCH: v2.10
1414

1515
jobs:
1616
cross-build:
@@ -21,7 +21,7 @@ jobs:
2121
- [aarch64-linux-gnu, aarch64, arm64]
2222
- [arm-linux-gnueabihf, armv4, armhf]
2323
- [x86_64-linux-gnu, x86_64, amd64]
24-
container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-main
24+
container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-v2.10
2525

2626
steps:
2727
- uses: actions/checkout@v4
@@ -64,7 +64,7 @@ jobs:
6464
matrix:
6565
arch:
6666
- [x86_64-linux-gnu, x86_64, amd64]
67-
container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-main
67+
container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-v2.10
6868

6969
steps:
7070
- uses: actions/checkout@v4

cmake/aarch64-linux-gnu.cmake

+1-1
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.10/libs)
55

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

cmake/arm-linux-gnueabi.cmake

+1-1
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.10/libs)
55

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

cmake/arm-linux-gnueabihf.cmake

+1-1
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.10/libs)
55

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

cmake/x86_64-linux-gnu.cmake

+1-1
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.10/libs)
55

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

0 commit comments

Comments
 (0)