Skip to content

Commit

Permalink
Merge branch 'dev' into refactor/api-v2
Browse files Browse the repository at this point in the history
  • Loading branch information
Serein207 authored Feb 4, 2025
2 parents 7e1fdde + 7599dd9 commit 14b7e67
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/clang-tidy-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
run: cmake --preset native -DCMAKE_EXPORT_COMPILE_COMMANDS=ON

- name: Run clang-tidy
uses: ZedThree/clang-tidy-review@v0.19.0
uses: ZedThree/clang-tidy-review@v0.20.1
id: review
with:
build_dir: build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/format-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: GCC Problem Matcher
uses: ammaraskar/gcc-problem-matcher@0.3.0
- name: Clang Format Check
uses: jidicula/clang-format-action@v4.13.0
uses: jidicula/clang-format-action@v4.14.0
with:
clang-format-version: '18'
check-path: 'src'
2 changes: 1 addition & 1 deletion 3rdpart/keychain
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ if (POLICY CMP0167)
cmake_policy(SET CMP0167 OLD)
endif()

if (POLICY CMP0177)
cmake_policy(SET CMP0177 OLD)
endif()

project(sast-evento VERSION ${VERSION_SEMANTIC} LANGUAGES CXX)

if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,8 @@ emerge -av eselect-repository
eselect repository add corcodile git https://github.com/f3rmata/corcodile.git
```

Using `spdlog` in overlay to fix the bundled `fmt` issue.
```bash
emerge -av spdlog::corcodile sast-evento
emerge -av app-misc/sast-evento --autounmask
```

## :open_file_folder: Files Produced
Expand Down Expand Up @@ -220,4 +219,4 @@ Pull requests and any feedback are welcome. For major changes, please open an is
- [toml++](https://github.com/marzer/tomlplusplus)
- [nlohmann-json](https://github.com/nlohmann/json)
- [spdlog](https://github.com/gabime/spdlog)
- [keychain](https://github.com/hrantzsch/keychain.git)
- [keychain](https://github.com/hrantzsch/keychain.git)
5 changes: 2 additions & 3 deletions doc/README_zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,8 @@ emerge -av eselect-repository
eselect repository add corcodile git https://github.com/f3rmata/corcodile.git
```

使用 overlay 中的 `spdlog` 解决捆绑的 `fmt` 问题。
```bash
emerge -av spdlog::corcodile sast-evento
emerge -av app-misc/sast-evento --autounmask
```

## :open_file_folder: 生成的文件
Expand Down Expand Up @@ -220,4 +219,4 @@ cmake --preset native -DVCPKG_MANIFEST_FEATURES=qt-from-vcpkg -DVCPKG_TARGET_TRI
- [toml++](https://github.com/marzer/tomlplusplus)
- [nlohmann-json](https://github.com/nlohmann/json)
- [spdlog](https://github.com/gabime/spdlog)
- [keychain](https://github.com/hrantzsch/keychain.git)
- [keychain](https://github.com/hrantzsch/keychain.git)
2 changes: 2 additions & 0 deletions src/Infrastructure/Cache/Cache.cc
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ std::optional<CacheEntry> CacheManager::get(std::string const& key) {
return std::nullopt;
}

_cacheList.splice(_cacheList.begin(), _cacheList, it->second);

return it->second->second;
}

Expand Down
4 changes: 2 additions & 2 deletions src/Infrastructure/Network/NetworkClient.cc
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ Task<JsonResult> NetworkClient::handleGithubResponse(http::response<http::dynami
if (status == http::status::found || status == http::status::moved_permanently
|| status == http::status::temporary_redirect) {
auto location = response.base().at("Location");
spdlog::info("Redirecting to {}", location);
spdlog::info("Redirecting to {}", std::string(location));
auto redirectUrl = urls::url_view(location);
co_return co_await this->request<api::Github>(http::verb::get, redirectUrl);
} else if (status != http::status::ok) {
Expand Down Expand Up @@ -686,4 +686,4 @@ NetworkClient* networkClient() {
return NetworkClient::getInstance();
}

} // namespace evento
} // namespace evento

0 comments on commit 14b7e67

Please sign in to comment.