From a09f8cc68bca8104f4910a0d85462586a863322b Mon Sep 17 00:00:00 2001 From: tqcq <99722391+tqcq@users.noreply.github.com> Date: Fri, 23 Aug 2024 21:12:10 +0800 Subject: [PATCH] feat update --- .woodpecker/linux-aarch64-gcc.yml | 37 ------------------------------ .woodpecker/linux-arm-gcc.yml.stop | 30 ------------------------ .woodpecker/linux-x64-gcc.yml | 37 ------------------------------ .woodpecker/linux-x86-gcc.yml.stop | 36 ----------------------------- tile/base/config/configurable.h | 2 +- tile/base/config/configuration.cc | 2 ++ tile/base/config/configuration.h | 1 - 7 files changed, 3 insertions(+), 142 deletions(-) delete mode 100644 .woodpecker/linux-aarch64-gcc.yml delete mode 100644 .woodpecker/linux-arm-gcc.yml.stop delete mode 100644 .woodpecker/linux-x64-gcc.yml delete mode 100644 .woodpecker/linux-x86-gcc.yml.stop diff --git a/.woodpecker/linux-aarch64-gcc.yml b/.woodpecker/linux-aarch64-gcc.yml deleted file mode 100644 index 02f22df..0000000 --- a/.woodpecker/linux-aarch64-gcc.yml +++ /dev/null @@ -1,37 +0,0 @@ -when: - - event: - - push - - pull_request - - path: - include: - - ".woodpecker/linux-aarch64-gcc.yml" - - "cmake/**" - - "third_party/**" - - "tile/**" - - "CMakeLists.txt" - -matrix: - BUILD_TYPE: - - Debug - - Release - -steps: - - name: linux-aarch64-gcc-build - image: art.uocat.com/docker/tqcq/cross:v1.0.1 - commands: - - mkdir build - - cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DTILE_BUILD_BENCHMARKS=ON -DTILE_BUILD_TESTS=ON -DCMAKE_TOOLCHAIN_FILE=./toolchains/aarch64-linux-gnu.toolchain.cmake - - cmake --build build -j $(nproc) - - - name: linux-aarch64-gcc-test - image: art.uocat.com/docker/tqcq/cross:v1.0.1 - commands: - - cd build - - ctest --output-on-failure -j $(nproc) - - # - name: linux-aarch64-gcc-benchmark - # image: art.uocat.com/docker/tqcq/cross:v1.0.1 - # commands: - # - ./build/bin/tile_bm_all - - diff --git a/.woodpecker/linux-arm-gcc.yml.stop b/.woodpecker/linux-arm-gcc.yml.stop deleted file mode 100644 index 9a167bb..0000000 --- a/.woodpecker/linux-arm-gcc.yml.stop +++ /dev/null @@ -1,30 +0,0 @@ -when: - - event: [] - #- push - #- pull_request - -matrix: - BUILD_TYPE: - - Debug - - Release - -steps: - - name: linux-arm-gcc-build - image: art.uocat.com/docker/tqcq/cross:v1.0.1 - commands: - - mkdir build - - cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DTILE_BUILD_BENCHMARKS=ON -DTILE_BUILD_TESTS=ON -DCMAKE_TOOLCHAIN_FILE=./toolchains/arm-linux-gnueabihf.toolchain.cmake - - cmake --build build -j $(nproc) - - - name: linux-arm-gcc-test - image: art.uocat.com/docker/tqcq/cross:v1.0.1 - commands: - - cd build - - ctest --output-on-failure -j $(nproc) - - # - name: linux-arm-gcc-benchmark - # image: art.uocat.com/docker/tqcq/cross:v1.0.1 - # commands: - # - ./build/bin/tile_bm_all - - diff --git a/.woodpecker/linux-x64-gcc.yml b/.woodpecker/linux-x64-gcc.yml deleted file mode 100644 index 5b03d91..0000000 --- a/.woodpecker/linux-x64-gcc.yml +++ /dev/null @@ -1,37 +0,0 @@ -when: - - event: - - push - - pull_request - - path: - include: - - ".woodpecker/linux-x64-gcc.yml" - - "cmake/**" - - "third_party/**" - - "tile/**" - - "CMakeLists.txt" - -matrix: - BUILD_TYPE: - - Debug - - Release - -steps: - - name: linux-x64-gcc-build - image: art.uocat.com/docker/tqcq/cross:v1.0.1 - commands: - - mkdir build - - cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DTILE_BUILD_BENCHMARKS=ON -DTILE_BUILD_TESTS=ON - - cmake --build build -j $(nproc) - - - name: linux-x64-gcc-test - image: art.uocat.com/docker/tqcq/cross:v1.0.1 - commands: - - cd build - - ctest --output-on-failure -j $(nproc) - - - name: linux-x64-gcc-benchmark - image: art.uocat.com/docker/tqcq/cross:v1.0.1 - commands: - - ./build/bin/tile_bm_all - - diff --git a/.woodpecker/linux-x86-gcc.yml.stop b/.woodpecker/linux-x86-gcc.yml.stop deleted file mode 100644 index 80fbaf1..0000000 --- a/.woodpecker/linux-x86-gcc.yml.stop +++ /dev/null @@ -1,36 +0,0 @@ -when: - - event: - - push - - pull_request - - path: - include: - - ".woodpecker/linux-x86-gcc.yml" - - "cmake/**" - - "third_party/**" - - "tile/**" - - "CMakeLists.txt" -matrix: - BUILD_TYPE: - - Debug - - Release - -steps: - - name: linux-x86-gcc-build - image: art.uocat.com/docker/tqcq/cross:v1.0.1 - commands: - - mkdir build - - cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DTILE_BUILD_BENCHMARKS=ON -DTILE_BUILD_TESTS=ON -DCMAKE_TOOLCHAIN_FILE=./toolchains/host.gcc-m32.toolchain.cmake - - cmake --build build -j $(nproc) - - - name: linux-x86-gcc-test - image: art.uocat.com/docker/tqcq/cross:v1.0.1 - commands: - - cd build - - ctest --output-on-failure -j $(nproc) - - - name: linux-x86-gcc-benchmark - image: art.uocat.com/docker/tqcq/cross:v1.0.1 - commands: - - ./build/bin/tile_bm_all - - diff --git a/tile/base/config/configurable.h b/tile/base/config/configurable.h index 6dc3969..ddbca56 100644 --- a/tile/base/config/configurable.h +++ b/tile/base/config/configurable.h @@ -2,7 +2,7 @@ #define TILE_BASE_CONFIG_CONFIGURABLE_H #pragma once -#include "tile/base/string.h" +#include "tile/base/slice.h" namespace tile { class Configurable { diff --git a/tile/base/config/configuration.cc b/tile/base/config/configuration.cc index 5e976e2..dd921b0 100644 --- a/tile/base/config/configuration.cc +++ b/tile/base/config/configuration.cc @@ -1,4 +1,6 @@ #include "tile/base/config/configuration.h" + +#include "tile/base/string.h" #include "tile/base/thread/unique_lock.h" namespace tile { diff --git a/tile/base/config/configuration.h b/tile/base/config/configuration.h index a637de1..4484dad 100644 --- a/tile/base/config/configuration.h +++ b/tile/base/config/configuration.h @@ -5,7 +5,6 @@ #include "tile/base/optional.h" #include "tile/base/ref_ptr.h" #include "tile/base/slice.h" -#include "tile/base/string.h" #include "tile/base/thread/mutex.h" #include "tile/sigslot/sigslot.h" #include