From eb483b6a501672670c901a06e40c0f40b95183e0 Mon Sep 17 00:00:00 2001 From: tqcq <99722391+tqcq@users.noreply.github.com> Date: Mon, 30 Dec 2024 14:49:07 +0800 Subject: [PATCH 1/5] feat update version to 0.1.2 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a164210..b517601 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5) set(tile_VERSION_MAJOR 0) set(tile_VERSION_MINOR 1) -set(tile_VERSION_PATCH 1) +set(tile_VERSION_PATCH 2) set(tile_VERSION_BUILD $ENV{CI_STEP_NUMBER}) if(NOT tile_VERSION_BUILD) set(tile_VERSION_BUILD "0") From 44e92a75f5d9624e471574f5c8261c5a6ad85956 Mon Sep 17 00:00:00 2001 From: tqcq <99722391+tqcq@users.noreply.github.com> Date: Mon, 30 Dec 2024 17:19:43 +0800 Subject: [PATCH 2/5] feat fix time_keeper_test failed. --- tile/base/internal/time_keeper_test.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tile/base/internal/time_keeper_test.cc b/tile/base/internal/time_keeper_test.cc index e0dc0be..a1b6365 100644 --- a/tile/base/internal/time_keeper_test.cc +++ b/tile/base/internal/time_keeper_test.cc @@ -14,6 +14,7 @@ namespace internal { constexpr auto kTestDuration = std::chrono::seconds(5); constexpr auto kInterval = std::chrono::milliseconds(100); constexpr auto kTimerNum = 100; +constexpr auto kExpFactor = 0.5; TEST(TimeKeeper, OneFastTimer) { @@ -22,7 +23,7 @@ TEST(TimeKeeper, OneFastTimer) std::this_thread::sleep_for(kTestDuration); TimeKeeper::Instance()->KillTimer(timer_id); constexpr auto expires_count = kTestDuration / kInterval; - constexpr auto eps = expires_count / 10; + constexpr auto eps = expires_count * kExpFactor; ASSERT_NEAR(x, expires_count, eps); } @@ -39,7 +40,7 @@ TEST(TimeKeeper, SlowTimer) for (auto &&e : timers) { TimeKeeper::Instance()->KillTimer(e); } const auto expires_count = kTimerNum * (2 * kTestDuration / kInterval); - const auto eps = expires_count / 10; + const auto eps = expires_count * kExpFactor; ASSERT_NEAR(x, expires_count, eps); } @@ -56,7 +57,7 @@ TEST(TimeKeeper, FastTimer) for (auto &&e : timers) { TimeKeeper::Instance()->KillTimer(e); } const auto expires_count = kTimerNum * (2 * kTestDuration / kInterval); - const auto eps = expires_count / 10; + const auto eps = expires_count * kExpFactor; ASSERT_NEAR(x, expires_count, eps); } From f97ec3b3502f7db8b0d43c4b4509054c608efecb Mon Sep 17 00:00:00 2001 From: tqcq <99722391+tqcq@users.noreply.github.com> Date: Mon, 30 Dec 2024 18:23:20 +0800 Subject: [PATCH 3/5] feat update workflow group: ${{ github.workflow }}-${{ github.ref }} --- .gitea/workflows/android.yml | 2 +- .gitea/workflows/linux-aarch64-gcc.yml | 2 +- .gitea/workflows/linux-arm-gcc.yml | 2 +- .gitea/workflows/linux-mips-gcc.yml | 4 ++-- .gitea/workflows/linux-mips64-gcc.yml | 4 ++-- .gitea/workflows/linux-riscv64-gcc.yml | 4 ++-- .gitea/workflows/linux-x64-clang.yml | 2 +- .gitea/workflows/linux-x64-gcc.yml | 2 +- .gitea/workflows/linux-x86-gcc.yml | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitea/workflows/android.yml b/.gitea/workflows/android.yml index fa1288d..f222b1c 100644 --- a/.gitea/workflows/android.yml +++ b/.gitea/workflows/android.yml @@ -17,7 +17,7 @@ on: - "third_party/**" concurrency: - group: android-${{github.ref}} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: diff --git a/.gitea/workflows/linux-aarch64-gcc.yml b/.gitea/workflows/linux-aarch64-gcc.yml index d1d814e..98f7e29 100644 --- a/.gitea/workflows/linux-aarch64-gcc.yml +++ b/.gitea/workflows/linux-aarch64-gcc.yml @@ -24,7 +24,7 @@ on: - "CMakeLists.txt" - "cmake/**" concurrency: - group: linux-aarch64-cpu-gcc-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true permissions: contents: read diff --git a/.gitea/workflows/linux-arm-gcc.yml b/.gitea/workflows/linux-arm-gcc.yml index 1b636dd..7ce77cf 100644 --- a/.gitea/workflows/linux-arm-gcc.yml +++ b/.gitea/workflows/linux-arm-gcc.yml @@ -26,7 +26,7 @@ on: - CMakeLists.txt - cmake/** concurrency: - group: linux-arm-gcc-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: linux-gcc-arm: diff --git a/.gitea/workflows/linux-mips-gcc.yml b/.gitea/workflows/linux-mips-gcc.yml index aaf8302..e88b7cc 100644 --- a/.gitea/workflows/linux-mips-gcc.yml +++ b/.gitea/workflows/linux-mips-gcc.yml @@ -22,9 +22,9 @@ on: - CMakeLists.txt - cmake/** concurrency: - group: linux-mips-gcc-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true -permissions: read-all + jobs: linux-gcc-mipsel: runs-on: ubuntu-20.04 diff --git a/.gitea/workflows/linux-mips64-gcc.yml b/.gitea/workflows/linux-mips64-gcc.yml index cb546f6..cf1eda2 100644 --- a/.gitea/workflows/linux-mips64-gcc.yml +++ b/.gitea/workflows/linux-mips64-gcc.yml @@ -23,9 +23,9 @@ on: - CMakeLists.txt - cmake/** concurrency: - group: linux-mips64-gcc-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true -permissions: read-all + jobs: linux-gcc-mips64el: runs-on: ubuntu-20.04 diff --git a/.gitea/workflows/linux-riscv64-gcc.yml b/.gitea/workflows/linux-riscv64-gcc.yml index a2ad63a..1427928 100644 --- a/.gitea/workflows/linux-riscv64-gcc.yml +++ b/.gitea/workflows/linux-riscv64-gcc.yml @@ -24,9 +24,9 @@ on: - CMakeLists.txt - cmake/** concurrency: - group: linux-riscv64-gcc-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true -permissions: read-all + jobs: linux-gcc-riscv64: runs-on: ubuntu-20.04 diff --git a/.gitea/workflows/linux-x64-clang.yml b/.gitea/workflows/linux-x64-clang.yml index b6ad819..457f1e5 100644 --- a/.gitea/workflows/linux-x64-clang.yml +++ b/.gitea/workflows/linux-x64-clang.yml @@ -16,7 +16,7 @@ on: - "CMakeLists.txt" concurrency: - group: linux-x64-clang-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: diff --git a/.gitea/workflows/linux-x64-gcc.yml b/.gitea/workflows/linux-x64-gcc.yml index 4ba9a66..cec5acc 100644 --- a/.gitea/workflows/linux-x64-gcc.yml +++ b/.gitea/workflows/linux-x64-gcc.yml @@ -20,7 +20,7 @@ on: - "CMakeLists.txt" concurrency: - group: linux-x64-gcc-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: diff --git a/.gitea/workflows/linux-x86-gcc.yml b/.gitea/workflows/linux-x86-gcc.yml index 415a7d2..016d903 100644 --- a/.gitea/workflows/linux-x86-gcc.yml +++ b/.gitea/workflows/linux-x86-gcc.yml @@ -22,7 +22,7 @@ on: - "CMakeLists.txt" concurrency: - group: linux-x86-gcc-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: From ed5a772ffbfbaf51ce49128cc9bf9c84fe03b26f Mon Sep 17 00:00:00 2001 From: tqcq Date: Mon, 30 Dec 2024 11:51:36 +0000 Subject: [PATCH 4/5] feat update version to 0.1.2 (#11) Reviewed-on: https://code.uocat.com/tqcq/tile/pulls/11 --- .gitea/workflows/android.yml | 2 +- .gitea/workflows/linux-aarch64-gcc.yml | 2 +- .gitea/workflows/linux-arm-gcc.yml | 2 +- .gitea/workflows/linux-mips-gcc.yml | 4 ++-- .gitea/workflows/linux-mips64-gcc.yml | 4 ++-- .gitea/workflows/linux-riscv64-gcc.yml | 4 ++-- .gitea/workflows/linux-x64-clang.yml | 2 +- .gitea/workflows/linux-x64-gcc.yml | 2 +- .gitea/workflows/linux-x86-gcc.yml | 2 +- CMakeLists.txt | 2 +- tile/base/internal/time_keeper_test.cc | 7 ++++--- 11 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.gitea/workflows/android.yml b/.gitea/workflows/android.yml index fa1288d..f222b1c 100644 --- a/.gitea/workflows/android.yml +++ b/.gitea/workflows/android.yml @@ -17,7 +17,7 @@ on: - "third_party/**" concurrency: - group: android-${{github.ref}} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: diff --git a/.gitea/workflows/linux-aarch64-gcc.yml b/.gitea/workflows/linux-aarch64-gcc.yml index d1d814e..98f7e29 100644 --- a/.gitea/workflows/linux-aarch64-gcc.yml +++ b/.gitea/workflows/linux-aarch64-gcc.yml @@ -24,7 +24,7 @@ on: - "CMakeLists.txt" - "cmake/**" concurrency: - group: linux-aarch64-cpu-gcc-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true permissions: contents: read diff --git a/.gitea/workflows/linux-arm-gcc.yml b/.gitea/workflows/linux-arm-gcc.yml index 1b636dd..7ce77cf 100644 --- a/.gitea/workflows/linux-arm-gcc.yml +++ b/.gitea/workflows/linux-arm-gcc.yml @@ -26,7 +26,7 @@ on: - CMakeLists.txt - cmake/** concurrency: - group: linux-arm-gcc-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: linux-gcc-arm: diff --git a/.gitea/workflows/linux-mips-gcc.yml b/.gitea/workflows/linux-mips-gcc.yml index aaf8302..e88b7cc 100644 --- a/.gitea/workflows/linux-mips-gcc.yml +++ b/.gitea/workflows/linux-mips-gcc.yml @@ -22,9 +22,9 @@ on: - CMakeLists.txt - cmake/** concurrency: - group: linux-mips-gcc-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true -permissions: read-all + jobs: linux-gcc-mipsel: runs-on: ubuntu-20.04 diff --git a/.gitea/workflows/linux-mips64-gcc.yml b/.gitea/workflows/linux-mips64-gcc.yml index cb546f6..cf1eda2 100644 --- a/.gitea/workflows/linux-mips64-gcc.yml +++ b/.gitea/workflows/linux-mips64-gcc.yml @@ -23,9 +23,9 @@ on: - CMakeLists.txt - cmake/** concurrency: - group: linux-mips64-gcc-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true -permissions: read-all + jobs: linux-gcc-mips64el: runs-on: ubuntu-20.04 diff --git a/.gitea/workflows/linux-riscv64-gcc.yml b/.gitea/workflows/linux-riscv64-gcc.yml index a2ad63a..1427928 100644 --- a/.gitea/workflows/linux-riscv64-gcc.yml +++ b/.gitea/workflows/linux-riscv64-gcc.yml @@ -24,9 +24,9 @@ on: - CMakeLists.txt - cmake/** concurrency: - group: linux-riscv64-gcc-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true -permissions: read-all + jobs: linux-gcc-riscv64: runs-on: ubuntu-20.04 diff --git a/.gitea/workflows/linux-x64-clang.yml b/.gitea/workflows/linux-x64-clang.yml index b6ad819..457f1e5 100644 --- a/.gitea/workflows/linux-x64-clang.yml +++ b/.gitea/workflows/linux-x64-clang.yml @@ -16,7 +16,7 @@ on: - "CMakeLists.txt" concurrency: - group: linux-x64-clang-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: diff --git a/.gitea/workflows/linux-x64-gcc.yml b/.gitea/workflows/linux-x64-gcc.yml index 4ba9a66..cec5acc 100644 --- a/.gitea/workflows/linux-x64-gcc.yml +++ b/.gitea/workflows/linux-x64-gcc.yml @@ -20,7 +20,7 @@ on: - "CMakeLists.txt" concurrency: - group: linux-x64-gcc-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: diff --git a/.gitea/workflows/linux-x86-gcc.yml b/.gitea/workflows/linux-x86-gcc.yml index 415a7d2..016d903 100644 --- a/.gitea/workflows/linux-x86-gcc.yml +++ b/.gitea/workflows/linux-x86-gcc.yml @@ -22,7 +22,7 @@ on: - "CMakeLists.txt" concurrency: - group: linux-x86-gcc-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: diff --git a/CMakeLists.txt b/CMakeLists.txt index a164210..b517601 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5) set(tile_VERSION_MAJOR 0) set(tile_VERSION_MINOR 1) -set(tile_VERSION_PATCH 1) +set(tile_VERSION_PATCH 2) set(tile_VERSION_BUILD $ENV{CI_STEP_NUMBER}) if(NOT tile_VERSION_BUILD) set(tile_VERSION_BUILD "0") diff --git a/tile/base/internal/time_keeper_test.cc b/tile/base/internal/time_keeper_test.cc index e0dc0be..a1b6365 100644 --- a/tile/base/internal/time_keeper_test.cc +++ b/tile/base/internal/time_keeper_test.cc @@ -14,6 +14,7 @@ namespace internal { constexpr auto kTestDuration = std::chrono::seconds(5); constexpr auto kInterval = std::chrono::milliseconds(100); constexpr auto kTimerNum = 100; +constexpr auto kExpFactor = 0.5; TEST(TimeKeeper, OneFastTimer) { @@ -22,7 +23,7 @@ TEST(TimeKeeper, OneFastTimer) std::this_thread::sleep_for(kTestDuration); TimeKeeper::Instance()->KillTimer(timer_id); constexpr auto expires_count = kTestDuration / kInterval; - constexpr auto eps = expires_count / 10; + constexpr auto eps = expires_count * kExpFactor; ASSERT_NEAR(x, expires_count, eps); } @@ -39,7 +40,7 @@ TEST(TimeKeeper, SlowTimer) for (auto &&e : timers) { TimeKeeper::Instance()->KillTimer(e); } const auto expires_count = kTimerNum * (2 * kTestDuration / kInterval); - const auto eps = expires_count / 10; + const auto eps = expires_count * kExpFactor; ASSERT_NEAR(x, expires_count, eps); } @@ -56,7 +57,7 @@ TEST(TimeKeeper, FastTimer) for (auto &&e : timers) { TimeKeeper::Instance()->KillTimer(e); } const auto expires_count = kTimerNum * (2 * kTestDuration / kInterval); - const auto eps = expires_count / 10; + const auto eps = expires_count * kExpFactor; ASSERT_NEAR(x, expires_count, eps); } From 9f48df425cf897b58d87b124186eb80a93f84268 Mon Sep 17 00:00:00 2001 From: tqcq <99722391+tqcq@users.noreply.github.com> Date: Mon, 30 Dec 2024 19:54:46 +0800 Subject: [PATCH 5/5] feat remove unused code --- CMakeLists.txt | 70 ++++++++------------------------------------------ 1 file changed, 11 insertions(+), 59 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b517601..d80fb11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,31 +42,6 @@ if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Release") endif() -# if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") # set(CMAKE_CXX_FLAGS -# "${CMAKE_CXX_FLAGS} -gz") # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -gz") # -# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static") set(CMAKE_C_FLAGS # -# "${CMAKE_CXX_FLAGS} -static") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} # -# -fsanitize=address ") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address # -# ") -# -# set(WHOLE_ARCHIVE_PREFIX "-Wl,-force_load") # set(NO_WHOLE_ARCHIVE_PREFIX "") -# elseif(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") # set(CMAKE_CXX_FLAGS -# "${CMAKE_CXX_FLAGS} -gz") # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -gz") # -# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static") set(CMAKE_C_FLAGS # -# "${CMAKE_CXX_FLAGS} -static") -# -# set(WHOLE_ARCHIVE_PREFIX "-Wl,-force_load,") # set(NO_WHOLE_ARCHIVE_PREFIX "") -# elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") set(CMAKE_CXX_FLAGS -# "${CMAKE_CXX_FLAGS} -gz") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -gz") # -# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++") # -# set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++") -# -# set(STATIC_BINARY_FLAGS "-static-libgcc -static-libstdc++") -# set(WHOLE_ARCHIVE_PREFIX "-Wl,--whole-archive") set(WHOLE_ARCHIVE_SUFFIX -# "-Wl,--no-whole-archive") endif() - -# extern int getifaddrs(struct ifaddrs **ifap); extern void freeifaddrs(struct -# ifaddrs *ifa); include(CheckSymbolExists) include(cmake/BuildInfo.cmake) @@ -92,42 +67,19 @@ add_subdirectory("third_party/googletest") add_subdirectory("third_party/gflags") set(GFLAGS_USE_TARGET_NAMESPACE ON) set(gflags_DIR "${CMAKE_CURRENT_BINARY_DIR}/third_party/gflags") -# add_subdirectory("third_party/context") set(CURL_DISABLE_TESTS ON) -set(CURL_CA_PATH - "none" - CACHE STRING "" FORCE) -set(CURL_ENABLE_SSL - OFF - CACHE BOOL "" FORCE) -set(USE_LIBIDN2 - OFF - CACHE BOOL "" FORCE) -set(CURL_USE_LIBPSL - OFF - CACHE BOOL "" FORCE) -set(CURL_USE_LIBSSH - OFF - CACHE BOOL "" FORCE) -set(CURL_USE_LIBSSH2 - OFF - CACHE BOOL "" FORCE) -set(CURL_USE_GSSAPI - OFF - CACHE BOOL "" FORCE) -set(CURL_USE_RTMP - OFF - CACHE BOOL "" FORCE) -set(USE_OPENSSL_QUIC - OFF - CACHE BOOL "" FORCE) -set(USE_MSH3 - OFF - CACHE BOOL "" FORCE) -set(CURL_DISABLE_LDAP - ON - CACHE BOOL "" FORCE) +set(CURL_CA_PATH "none" CACHE STRING "" FORCE) +set(CURL_ENABLE_SSL OFF CACHE BOOL "" FORCE) +set(USE_LIBIDN2 OFF CACHE BOOL "" FORCE) +set(CURL_USE_LIBPSL OFF CACHE BOOL "" FORCE) +set(CURL_USE_LIBSSH OFF CACHE BOOL "" FORCE) +set(CURL_USE_LIBSSH2 OFF CACHE BOOL "" FORCE) +set(CURL_USE_GSSAPI OFF CACHE BOOL "" FORCE) +set(CURL_USE_RTMP OFF CACHE BOOL "" FORCE) +set(USE_OPENSSL_QUIC OFF CACHE BOOL "" FORCE) +set(USE_MSH3 OFF CACHE BOOL "" FORCE) +set(CURL_DISABLE_LDAP ON CACHE BOOL "" FORCE) set(ZLIB_FOUND ON) set(ZLIB_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/third_party/zlib") set(ZLIB_LIBRARIES zlib)