diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 3fd583ad..0a92587f 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -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.13 steps: - uses: actions/checkout@v4 @@ -42,7 +42,7 @@ jobs: build: runs-on: ubuntu-24.04 - container: ghcr.io/neugates/build:x86_64-main + container: ghcr.io/neugates/build:x86_64-v2.13 steps: - uses: actions/checkout@v4 @@ -65,7 +65,7 @@ jobs: ut: runs-on: ubuntu-24.04 - container: ghcr.io/neugates/build:x86_64-main + container: ghcr.io/neugates/build:x86_64-v2.13 needs: [build] steps: @@ -103,7 +103,7 @@ jobs: pft: runs-on: ubuntu-24.04 - container: ghcr.io/neugates/build:x86_64-main + container: ghcr.io/neugates/build:x86_64-v2.13 needs: [build] strategy: matrix: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bbf8c2d6..2752d468 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,9 +8,9 @@ on: - published env: - VERSION: 2.12.0 + VERSION: 2.13.0 UI_VERSION: 2.6.1 - BRANCH: main + BRANCH: v2.13 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] }}-main + container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-v2.13 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] }}-main + container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-v2.13 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/manual-unused-plugins.yml b/.github/workflows/manual-unused-plugins.yml index 7be14bf2..6b30c0a1 100644 --- a/.github/workflows/manual-unused-plugins.yml +++ b/.github/workflows/manual-unused-plugins.yml @@ -11,7 +11,7 @@ on: jobs: build: runs-on: ubuntu-24.04 - container: ghcr.io/neugates/build:x86_64-main + container: ghcr.io/neugates/build:x86_64-v2.13 steps: - uses: actions/checkout@v4 @@ -33,7 +33,7 @@ jobs: unused_plugins_test: runs-on: ubuntu-24.04 - container: ghcr.io/neugates/build:x86_64-main + container: ghcr.io/neugates/build:x86_64-v2.13 needs: [build] strategy: matrix: diff --git a/cmake/aarch64-linux-gnu.cmake b/cmake/aarch64-linux-gnu.cmake index 5c81eef2..8a3b7803 100644 --- a/cmake/aarch64-linux-gnu.cmake +++ b/cmake/aarch64-linux-gnu.cmake @@ -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.13/libs) set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc) set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++) diff --git a/cmake/arm-linux-gnueabi.cmake b/cmake/arm-linux-gnueabi.cmake index 812143e6..2eb14643 100644 --- a/cmake/arm-linux-gnueabi.cmake +++ b/cmake/arm-linux-gnueabi.cmake @@ -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.13/libs) set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc) set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++) diff --git a/cmake/arm-linux-gnueabihf.cmake b/cmake/arm-linux-gnueabihf.cmake index 203b119c..9e27e22f 100644 --- a/cmake/arm-linux-gnueabihf.cmake +++ b/cmake/arm-linux-gnueabihf.cmake @@ -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.13/libs) set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc) set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++) diff --git a/cmake/x86_64-linux-gnu.cmake b/cmake/x86_64-linux-gnu.cmake index 5c97384e..d8006966 100644 --- a/cmake/x86_64-linux-gnu.cmake +++ b/cmake/x86_64-linux-gnu.cmake @@ -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.13/libs) set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc) set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++) diff --git a/include/neuron/define.h b/include/neuron/define.h index 9f43d49e..22656c17 100644 --- a/include/neuron/define.h +++ b/include/neuron/define.h @@ -23,7 +23,7 @@ #include #define NEU_VERSION_MAJOR 2 -#define NEU_VERSION_MINOR 12 +#define NEU_VERSION_MINOR 13 #define NEU_VERSION_FIX 0 #define NEU_GET_VERSION_MAJOR(V) ((0xffff0000 & V) >> 16) diff --git a/tests/plugins/c1/c1_2.c b/tests/plugins/c1/c1_2.c index c6ba1687..90c3a5b5 100644 --- a/tests/plugins/c1/c1_2.c +++ b/tests/plugins/c1/c1_2.c @@ -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, 12, 99), + .version = NEU_VERSION(2, 13, 99), .schema = "c1", .module_name = "c1", .module_descr = "c1 v2", diff --git a/version b/version index 4879166f..bd2e0773 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.12.0-alpha \ No newline at end of file +2.13.0-alpha \ No newline at end of file