diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 33507e15..1fe7dfe1 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -7,9 +7,6 @@ on: types: - published -env: - BRANCH: v2.6 - jobs: clang_format_check: runs-on: ubuntu-20.04 @@ -43,7 +40,7 @@ jobs: ut: runs-on: ubuntu-20.04 - container: ghcr.io/neugates/build:x86_64-${{ env.BRANCH }} + container: ghcr.io/neugates/build:x86_64-v2.6 steps: @@ -78,7 +75,7 @@ jobs: ft: runs-on: ubuntu-20.04 - container: ghcr.io/neugates/build:x86_64-${{ env.BRANCH }} + container: ghcr.io/neugates/build:x86_64-v2.6 steps: - uses: actions/checkout@v2 @@ -111,7 +108,7 @@ jobs: pyft: runs-on: ubuntu-20.04 - container: ghcr.io/neugates/build:x86_64-${{ env.BRANCH }} + container: ghcr.io/neugates/build:x86_64-v2.6 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e5d580a5..08b0bc8f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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] }}-${{ env.BRANCH }} + container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-v2.6 steps: - uses: actions/checkout@v3 @@ -64,7 +64,7 @@ jobs: matrix: arch: - [x86_64-linux-gnu, x86_64, amd64] - container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-${{ env.BRANCH }}} + container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-v2.6 steps: - uses: actions/checkout@v3 diff --git a/cmake/aarch64-linux-gnu.cmake b/cmake/aarch64-linux-gnu.cmake index 5c81eef2..182c602b 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.6/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..133f03bd 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.6/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..b08a6929 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.6/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 98866b69..f582c33b 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.6/libs) set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc) set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)