Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/ci-pr-validation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,11 @@ jobs:

- name: Restore vcpkg installed cache
uses: actions/cache@v4
id: vcpkg-cache
if: always() && steps.vcpkg-cache.outputs.cache-hit != 'true'
with:
path: build/vcpkg_installed
key: vcpkg-${{ runner.os }}-${{ hashFiles('vcpkg.json', 'CMakeLists.txt', 'vcpkg-triplets/**') }}
key: vcpkg-${{ runner.os }}-${{ hashFiles('vcpkg.json') }}
restore-keys: vcpkg-${{ runner.os }}-

- name: Build the project
Expand Down Expand Up @@ -126,11 +128,13 @@ jobs:

- name: Restore vcpkg installed cache
uses: actions/cache@v4
id: vcpkg-cache
if: always() && steps.vcpkg-cache.outputs.cache-hit != 'true'
with:
path: |
build/vcpkg_installed
build-boost-asio/vcpkg_installed
key: vcpkg-${{ runner.os }}-${{ hashFiles('vcpkg.json', 'CMakeLists.txt', 'vcpkg-triplets/**') }}
key: vcpkg-${{ runner.os }}-${{ hashFiles('vcpkg.json') }}
restore-keys: vcpkg-${{ runner.os }}-

- name: Build core libraries
Expand Down Expand Up @@ -168,11 +172,6 @@ jobs:
cmake -B build -DINTEGRATE_VCPKG=ON -DBUILD_TESTS=ON -DBUILD_PERF_TOOLS=ON
cmake --build build -j8

- name: Verify custom vcpkg installation
run: |
mv vcpkg /tmp/vcpkg-custom
cmake -B build-2 -DINTEGRATE_VCPKG=ON -DCMAKE_TOOLCHAIN_FILE="/tmp/vcpkg-custom/scripts/buildsystems/vcpkg.cmake"

cpp20-build:
name: Build with the C++20 standard
needs: lint
Expand Down Expand Up @@ -229,7 +228,7 @@ jobs:
- name: Restore vcpkg and its artifacts.
uses: actions/cache@v4
id: vcpkg-cache
continue-on-error: true
if: always() && steps.vcpkg-cache.outputs.cache-hit != 'true'
with:
path: |
${{ github.workspace }}/vcpkg_installed
Expand All @@ -238,7 +237,6 @@ jobs:
key: ${{ runner.os }}-${{ matrix.triplet }}-vcpkg-${{ hashFiles('vcpkg.json') }}
restore-keys: |
${{ runner.os }}-${{ matrix.triplet }}-vcpkg-
save-always: true

- name: Get vcpkg(windows)
if: ${{ runner.os == 'Windows' && steps.vcpkg-cache.outputs.cache-hit != 'true' }}
Expand Down Expand Up @@ -387,9 +385,11 @@ jobs:

- name: Restore vcpkg installed cache
uses: actions/cache@v4
id: vcpkg-cache
if: always() && steps.vcpkg-cache.outputs.cache-hit != 'true'
with:
path: build-osx/vcpkg_installed
key: vcpkg-${{ runner.os }}-arm64-${{ hashFiles('vcpkg.json', 'CMakeLists.txt', 'vcpkg-triplets/**') }}
key: vcpkg-${{ runner.os }}-arm64-${{ hashFiles('vcpkg.json') }}
restore-keys: vcpkg-${{ runner.os }}-arm64-

- name: Build libraries
Expand Down
6 changes: 4 additions & 2 deletions build-support/run_clang_tidy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,10 @@ SCRIPT=$(which run-clang-tidy)
set +e
nproc
if [[ $? == 0 ]]; then
python3 $SCRIPT -p build -j$(nproc) $(cat files.txt)
NUM_THREADS=$(nproc)
else
python3 $SCRIPT -p build -j8 $(cat files.txt)
NUM_THREADS=8
fi
set -e
python3 $SCRIPT -p build -j$NUM_THREADS $(cat files.txt)
rm -f files.txt
2 changes: 1 addition & 1 deletion lib/ClientConnection.cc
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ void ClientConnection::tcpConnectAsync() {

auto weakSelf = weak_from_this();
resolver_->async_resolve(service_url.host(), std::to_string(service_url.port()),
[weakSelf](const ASIO_ERROR& err, tcp::resolver::results_type results) {
[weakSelf](auto err, const auto& results) {
auto self = weakSelf.lock();
if (self) {
self->handleResolve(err, results);
Expand Down
4 changes: 2 additions & 2 deletions tests/TlsNegotiationTest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ TEST(TlsNegotiationTest, testTls12) {
// It will fail to create producer because mock server doesn't speak Pulsar,
// but we only care about the handshake.
Producer producer;
client.createProducerAsync("topic", [](Result, Producer) {});
client.createProducerAsync("topic", [](auto, const auto&) {});

// Wait for handshake
ASSERT_TRUE(handshakeFuture.get());
Expand Down Expand Up @@ -170,7 +170,7 @@ TEST(TlsNegotiationTest, testTls13) {

Client client(serviceUrl, config);

client.createProducerAsync("topic", [](Result, Producer) {});
client.createProducerAsync("topic", [](auto, const auto&) {});

ASSERT_TRUE(handshakeFuture.get());

Expand Down
Loading