From c23d4310330c213ed13094f43157f1742b11af92 Mon Sep 17 00:00:00 2001 From: Fedor Osetrov <33493672+fdr400@users.noreply.github.com> Date: Fri, 27 Dec 2024 08:43:32 +0300 Subject: [PATCH 01/25] Update macos.yml --- .github/workflows/macos.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 24ef130cdd6c..9229d5e5d767 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -10,7 +10,6 @@ name: CI jobs: macos: - if: false name: MacOS (build only) runs-on: macos-latest env: From 29802aa28c4b51bbaa167bdc1351fd62606c40a3 Mon Sep 17 00:00:00 2001 From: Fedor Osetrov <33493672+fdr400@users.noreply.github.com> Date: Fri, 27 Dec 2024 08:57:35 +0300 Subject: [PATCH 02/25] Update macos.yml --- .github/workflows/macos.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 9229d5e5d767..ea3b3a54688d 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -25,9 +25,9 @@ jobs: -DUSERVER_FEATURE_MONGODB=1 -DUSERVER_FEATURE_CLICKHOUSE=1 -DUSERVER_USE_LD=lld - -DUSERVER_FORCE_DOWNLOAD_ABSEIL=1 - -DUSERVER_FORCE_DOWNLOAD_PROTOBUF=1 - -DUSERVER_FORCE_DOWNLOAD_GRPC=1 + -DUSERVER_FEATURE_GRPC=0 + -DUSERVER_FEATURE_OTLP=0 + -DUSERVER_FEATURE_GRPC_REFLECTION=0 steps: - uses: actions/checkout@v4 From 8a904b65d9ee4e8a8b25e76fe70a9d61441d7e18 Mon Sep 17 00:00:00 2001 From: Fedor Osetrov <33493672+fdr400@users.noreply.github.com> Date: Fri, 27 Dec 2024 09:14:42 +0300 Subject: [PATCH 03/25] Update macos.yml --- .github/workflows/macos.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index ea3b3a54688d..9229d5e5d767 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -25,9 +25,9 @@ jobs: -DUSERVER_FEATURE_MONGODB=1 -DUSERVER_FEATURE_CLICKHOUSE=1 -DUSERVER_USE_LD=lld - -DUSERVER_FEATURE_GRPC=0 - -DUSERVER_FEATURE_OTLP=0 - -DUSERVER_FEATURE_GRPC_REFLECTION=0 + -DUSERVER_FORCE_DOWNLOAD_ABSEIL=1 + -DUSERVER_FORCE_DOWNLOAD_PROTOBUF=1 + -DUSERVER_FORCE_DOWNLOAD_GRPC=1 steps: - uses: actions/checkout@v4 From c4c9074a28aa05f3209a6df1ac413b4373c358dc Mon Sep 17 00:00:00 2001 From: Fedor Osetrov <33493672+fdr400@users.noreply.github.com> Date: Fri, 27 Dec 2024 09:28:51 +0300 Subject: [PATCH 04/25] Update macos.yml --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 9229d5e5d767..44f57b706803 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -11,7 +11,7 @@ name: CI jobs: macos: name: MacOS (build only) - runs-on: macos-latest + runs-on: macos-14-arm64 env: CMAKE_FLAGS: >- -GNinja From 58bdc293646923fdcb8bbecf3d5b6222cef6fa02 Mon Sep 17 00:00:00 2001 From: Fedor Osetrov <33493672+fdr400@users.noreply.github.com> Date: Fri, 27 Dec 2024 10:47:34 +0300 Subject: [PATCH 05/25] Update macos.yml --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 44f57b706803..cee173157b59 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -11,7 +11,7 @@ name: CI jobs: macos: name: MacOS (build only) - runs-on: macos-14-arm64 + runs-on: macos-14 env: CMAKE_FLAGS: >- -GNinja From fe878e59a085371a59f3f277d8ba3ade95bd8d3d Mon Sep 17 00:00:00 2001 From: Fedor Osetrov <33493672+fdr400@users.noreply.github.com> Date: Fri, 27 Dec 2024 10:50:45 +0300 Subject: [PATCH 06/25] Update macos.yml --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index cee173157b59..7c66ba529bc3 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -11,7 +11,7 @@ name: CI jobs: macos: name: MacOS (build only) - runs-on: macos-14 + runs-on: macos-15 env: CMAKE_FLAGS: >- -GNinja From 21b6f3b297bc21065ea0d20843ae0723a60e3485 Mon Sep 17 00:00:00 2001 From: Fedor Osetrov <33493672+fdr400@users.noreply.github.com> Date: Fri, 27 Dec 2024 20:17:35 +0300 Subject: [PATCH 07/25] Update macos.yml --- .github/workflows/macos.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 7c66ba529bc3..6fbd6526fa78 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -11,7 +11,7 @@ name: CI jobs: macos: name: MacOS (build only) - runs-on: macos-15 + runs-on: macos-latest env: CMAKE_FLAGS: >- -GNinja @@ -54,3 +54,9 @@ jobs: - name: Compile run: | cmake --build build_debug -j$(nproc) -- -k 1 + + - name: Run tests (samples) + run: | + cd build_debug/samples + # Fix Kafka and Rabbitmq after https://github.com/yandex/yandex-taxi-testsuite/pull/109 + ctest -V -E "(kafka|mongo|rabbitmq)" From c5fcc70caae81d9db2ec29cc371a8ca90ea6b4a8 Mon Sep 17 00:00:00 2001 From: Fedor Osetrov <33493672+fdr400@users.noreply.github.com> Date: Fri, 27 Dec 2024 21:31:37 +0300 Subject: [PATCH 08/25] Update macos.yml --- .github/workflows/macos.yml | 63 +++++++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 6fbd6526fa78..9ec826602d08 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -10,7 +10,7 @@ name: CI jobs: macos: - name: MacOS (build only) + name: MacOS runs-on: macos-latest env: CMAKE_FLAGS: >- @@ -43,9 +43,11 @@ jobs: brew install python@3.11 brew install lld - brew link postgresql@16 + brew link postgresql@16 # postgres is keg-only - brew upgrade + - name: Install test dependencies + run: | + brew install clickhouse - name: Run cmake run: | @@ -55,8 +57,63 @@ jobs: run: | cmake --build build_debug -j$(nproc) -- -k 1 + - name: Run tests (universal) + run: | + cd build_debug/universal + ctest -V + - name: Run tests (samples) run: | cd build_debug/samples # Fix Kafka and Rabbitmq after https://github.com/yandex/yandex-taxi-testsuite/pull/109 ctest -V -E "(kafka|mongo|rabbitmq)" + + - name: Run tests (libraries) + run: | + cd build_debug/libraries + ctest -V + + - name: Run tests (clickhouse) + run: | + cd build_debug/clickhouse + ctest -V + + - name: Run tests (rocks) + run: | + cd build_debug/rocks + ctest -V + + - name: Run tests (postgresql) + run: | + cd build_debug/postgresql + ctest -V + + - name: Run tests (kafka) + if: false + run: | + # Enable after https://github.com/yandex/yandex-taxi-testsuite/pull/109 + cd build_debug/kafka + ctest -V + + - name: Run tests (rabbitmq) + if: false + run: | + # Enable after https://github.com/yandex/yandex-taxi-testsuite/pull/109 + cd build_debug/rabbitmq + ctest -V + + - name: Run tests (grpc) + run: | + cd build_debug/grpc + ctest -V + + - name: Run tests (mysql) + if: false + run: | + cd build_debug/mysql + GTEST_FILTER="-*Transaction*" ctest -V + + - name: Run tests (redis) + run: | + cd build_debug/redis + ctest -V -E testsuite-userver-redis-tests-basic-chaos From 2a06d2ff0c20098c5ae5cb43a76b1b97ae7d7f7f Mon Sep 17 00:00:00 2001 From: Fedor Osetrov <33493672+fdr400@users.noreply.github.com> Date: Fri, 27 Dec 2024 22:14:21 +0300 Subject: [PATCH 09/25] Update macos.yml --- .github/workflows/macos.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 9ec826602d08..1f8c41e78f0e 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -83,11 +83,6 @@ jobs: cd build_debug/rocks ctest -V - - name: Run tests (postgresql) - run: | - cd build_debug/postgresql - ctest -V - - name: Run tests (kafka) if: false run: | @@ -108,7 +103,6 @@ jobs: ctest -V - name: Run tests (mysql) - if: false run: | cd build_debug/mysql GTEST_FILTER="-*Transaction*" ctest -V @@ -117,3 +111,8 @@ jobs: run: | cd build_debug/redis ctest -V -E testsuite-userver-redis-tests-basic-chaos + + - name: Run tests (postgresql) + run: | + cd build_debug/postgresql + ctest -V From 14eac30ade7c60f19da179c11b32dcb8a89f9454 Mon Sep 17 00:00:00 2001 From: Fedor Osetrov <33493672+fdr400@users.noreply.github.com> Date: Fri, 27 Dec 2024 23:19:15 +0300 Subject: [PATCH 10/25] Update macos.yml --- .github/workflows/macos.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 1f8c41e78f0e..a9c8ec85f8b7 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -113,6 +113,7 @@ jobs: ctest -V -E testsuite-userver-redis-tests-basic-chaos - name: Run tests (postgresql) + if: false run: | cd build_debug/postgresql ctest -V From d82c134e053f4cc38a8344776e115134d1e35acd Mon Sep 17 00:00:00 2001 From: Fedor Osetrov <33493672+fdr400@users.noreply.github.com> Date: Sat, 28 Dec 2024 00:24:19 +0300 Subject: [PATCH 11/25] Update macos.yml --- .github/workflows/macos.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index a9c8ec85f8b7..64f2f6fba78a 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -113,7 +113,6 @@ jobs: ctest -V -E testsuite-userver-redis-tests-basic-chaos - name: Run tests (postgresql) - if: false run: | cd build_debug/postgresql - ctest -V + ulimit -n 4096 && ctest -V From 12434a033e0456ad8ea3a6beb0eb4c2bd38e33fb Mon Sep 17 00:00:00 2001 From: Fedor Osetrov <33493672+fdr400@users.noreply.github.com> Date: Sat, 28 Dec 2024 01:10:06 +0300 Subject: [PATCH 12/25] Update macos.yml --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 64f2f6fba78a..342d7e07e756 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -115,4 +115,4 @@ jobs: - name: Run tests (postgresql) run: | cd build_debug/postgresql - ulimit -n 4096 && ctest -V + ulimit -n 4096 && ctest -V -E testsuite-userver-postgresql-tests-basic-chaos From 482ed54c70c655d0a8d21fe80f45fc2506a2915f Mon Sep 17 00:00:00 2001 From: Fedor Osetrov <33493672+fdr400@users.noreply.github.com> Date: Sat, 28 Dec 2024 03:12:49 +0300 Subject: [PATCH 13/25] Update log.cpp --- universal/src/logging/log.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/universal/src/logging/log.cpp b/universal/src/logging/log.cpp index b68ac94ef0cd..698389c920d7 100644 --- a/universal/src/logging/log.cpp +++ b/universal/src/logging/log.cpp @@ -138,6 +138,9 @@ StaticLogEntry::StaticLogEntry(const char* path, int line) noexcept { static_assert(sizeof(LogEntryContent) == sizeof(content_)); // static_assert(std::is_trivially_destructible_v); auto* item = new (&content_) LogEntryContent(path, line); +#if defined(__APPLE__) + item->state.store(EntryState{}); +#endif RegisterLogLocation(*item); } From 5c504007a60f11448d7c2ef1ba468777ea4f1b11 Mon Sep 17 00:00:00 2001 From: Fedor Osetrov <33493672+fdr400@users.noreply.github.com> Date: Sat, 28 Dec 2024 03:14:13 +0300 Subject: [PATCH 14/25] Update macos.yml --- .github/workflows/macos.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 342d7e07e756..76c000ae7baf 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -68,6 +68,11 @@ jobs: # Fix Kafka and Rabbitmq after https://github.com/yandex/yandex-taxi-testsuite/pull/109 ctest -V -E "(kafka|mongo|rabbitmq)" + - name: Run tests (core) + run: | + cd build_debug/core + GTEST_FILTER="-Subprocess.EnvironmentVariablesScope" ctest -V + - name: Run tests (libraries) run: | cd build_debug/libraries From 052f3a2c3acc20e9ae0ed84d032d39ca3619c1ae Mon Sep 17 00:00:00 2001 From: Fedor Osetrov <33493672+fdr400@users.noreply.github.com> Date: Sat, 28 Dec 2024 15:15:22 +0300 Subject: [PATCH 15/25] Update macos.yml --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 76c000ae7baf..0b081e579b5d 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -71,7 +71,7 @@ jobs: - name: Run tests (core) run: | cd build_debug/core - GTEST_FILTER="-Subprocess.EnvironmentVariablesScope" ctest -V + ulimit -n 4096 && GTEST_FILTER="-Subprocess.EnvironmentVariablesScope" ctest -V - name: Run tests (libraries) run: | From 6673443f7fe3aae57ee794caa0a9295ee04b3de3 Mon Sep 17 00:00:00 2001 From: Fedor Osetrov <33493672+fdr400@users.noreply.github.com> Date: Sat, 28 Dec 2024 16:44:15 +0300 Subject: [PATCH 16/25] Update macos.yml --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 0b081e579b5d..bf949e399692 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -11,7 +11,7 @@ name: CI jobs: macos: name: MacOS - runs-on: macos-latest + runs-on: macos-15 env: CMAKE_FLAGS: >- -GNinja From 6a7acab46a1cfb5242c930a07f11d433254bfb91 Mon Sep 17 00:00:00 2001 From: Fedor Osetrov <33493672+fdr400@users.noreply.github.com> Date: Sat, 28 Dec 2024 17:29:50 +0300 Subject: [PATCH 17/25] Update macos.yml --- .github/workflows/macos.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index bf949e399692..6890a3ee2144 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -11,7 +11,7 @@ name: CI jobs: macos: name: MacOS - runs-on: macos-15 + runs-on: macos-latest env: CMAKE_FLAGS: >- -GNinja @@ -34,6 +34,15 @@ jobs: with: fetch-depth: 0 + - name: Reuse ccache directory + uses: actions/cache@v4 + with: + path: '~/Library/Caches/ccache' + key: 'ccache-dir ${{github.ref}} run-${{github.run_number}}' + restore-keys: | + ccache-dir ${{github.ref}} run-' + ccache- + - name: Install brew packages run: | export SDKROOT="`xcrun --show-sdk-path`" @@ -49,6 +58,11 @@ jobs: run: | brew install clickhouse + - name: Setup ccache + run: | + ccache -M 2.0GB + ccache -s + - name: Run cmake run: | cmake -S./ -B./build_debug -DUSERVER_PYTHON_PATH=$(brew --prefix)/bin/python3.11 $CMAKE_FLAGS From 6bde0fee0367b3a811f255fb68fc229df6bf0fad Mon Sep 17 00:00:00 2001 From: Fedor Osetrov <33493672+fdr400@users.noreply.github.com> Date: Sat, 28 Dec 2024 17:54:52 +0300 Subject: [PATCH 18/25] Update macos.yml --- .github/workflows/macos.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 6890a3ee2144..ae72bf741360 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -13,6 +13,7 @@ jobs: name: MacOS runs-on: macos-latest env: + CPM_SOURCE_CACHE: '~/Library/Caches/CPM' CMAKE_FLAGS: >- -GNinja -DCMAKE_BUILD_TYPE=Debug @@ -34,14 +35,15 @@ jobs: with: fetch-depth: 0 - - name: Reuse ccache directory + - name: Reuse cached directories uses: actions/cache@v4 with: - path: '~/Library/Caches/ccache' + path: | + '~/Library/Caches/ccache' + '~/Library/Caches/CPM' key: 'ccache-dir ${{github.ref}} run-${{github.run_number}}' restore-keys: | - ccache-dir ${{github.ref}} run-' - ccache- + ccache-dir ${{github.ref}} run- - name: Install brew packages run: | @@ -60,7 +62,7 @@ jobs: - name: Setup ccache run: | - ccache -M 2.0GB + ccache -M 4.0GB ccache -s - name: Run cmake From 23b00f692982550bebe6bd3db1718f318e9cb8d2 Mon Sep 17 00:00:00 2001 From: Fedor Osetrov <33493672+fdr400@users.noreply.github.com> Date: Sat, 28 Dec 2024 18:06:50 +0300 Subject: [PATCH 19/25] Update macos.yml --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index ae72bf741360..b4998a10b02e 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -87,7 +87,7 @@ jobs: - name: Run tests (core) run: | cd build_debug/core - ulimit -n 4096 && GTEST_FILTER="-Subprocess.EnvironmentVariablesScope" ctest -V + ulimit -n 4096 && GTEST_FILTER="-Subprocess.EnvironmentVariablesScope:HttpClient.StatsOnTimeout:PeriodicTask.*:AsyncFlatCombiningQueue.StressAsync" ctest -V - name: Run tests (libraries) run: | From 02af80d55b04b98b1f7709978b3e20dba0eedbeb Mon Sep 17 00:00:00 2001 From: Fedor Osetrov <33493672+fdr400@users.noreply.github.com> Date: Sat, 28 Dec 2024 18:40:22 +0300 Subject: [PATCH 20/25] Update macos.yml --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index b4998a10b02e..56f8863f87d4 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -87,7 +87,7 @@ jobs: - name: Run tests (core) run: | cd build_debug/core - ulimit -n 4096 && GTEST_FILTER="-Subprocess.EnvironmentVariablesScope:HttpClient.StatsOnTimeout:PeriodicTask.*:AsyncFlatCombiningQueue.StressAsync" ctest -V + ulimit -n 4096 && ctest -V -E userver-core-unittest # ~10 failed tests - name: Run tests (libraries) run: | From 770743705acdb75f596a9471cdf2b607b4188310 Mon Sep 17 00:00:00 2001 From: fdr400 Date: Sat, 28 Dec 2024 18:57:32 +0300 Subject: [PATCH 21/25] Update log.cpp --- universal/src/logging/log.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/universal/src/logging/log.cpp b/universal/src/logging/log.cpp index 698389c920d7..b68ac94ef0cd 100644 --- a/universal/src/logging/log.cpp +++ b/universal/src/logging/log.cpp @@ -138,9 +138,6 @@ StaticLogEntry::StaticLogEntry(const char* path, int line) noexcept { static_assert(sizeof(LogEntryContent) == sizeof(content_)); // static_assert(std::is_trivially_destructible_v); auto* item = new (&content_) LogEntryContent(path, line); -#if defined(__APPLE__) - item->state.store(EntryState{}); -#endif RegisterLogLocation(*item); } From 791a6676c6b39d87e49f3b5012ab437413a43cb1 Mon Sep 17 00:00:00 2001 From: Fedor Osetrov <33493672+fdr400@users.noreply.github.com> Date: Sat, 28 Dec 2024 19:27:53 +0300 Subject: [PATCH 22/25] Update macos.yml --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 56f8863f87d4..f316ac7bb5cc 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -87,7 +87,7 @@ jobs: - name: Run tests (core) run: | cd build_debug/core - ulimit -n 4096 && ctest -V -E userver-core-unittest # ~10 failed tests + ulimit -n 4096 && ctest -V -E userver-core-unittest -E testsuite-userver-core-tests-basic-chaos-tests-deadline # ~10 failed tests - name: Run tests (libraries) run: | From 823e27bdd76e92d0c6eac4ae65eec50fc40bee7c Mon Sep 17 00:00:00 2001 From: Fedor Osetrov <33493672+fdr400@users.noreply.github.com> Date: Sat, 28 Dec 2024 19:44:52 +0300 Subject: [PATCH 23/25] Update macos.yml --- .github/workflows/macos.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index f316ac7bb5cc..8b992a09aa43 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -58,7 +58,8 @@ jobs: - name: Install test dependencies run: | - brew install clickhouse + brew tap mongodb/brew + brew install clickhouse kafka mongodb-community - name: Setup ccache run: | @@ -99,6 +100,11 @@ jobs: cd build_debug/clickhouse ctest -V + - name: Run tests (mongo) + run: | + cd build_debug/mongo + ctest -V + - name: Run tests (rocks) run: | cd build_debug/rocks From 19dcddcbb9d891f28d436457856eb0c82d31be4d Mon Sep 17 00:00:00 2001 From: fdr400 Date: Sat, 28 Dec 2024 20:04:01 +0300 Subject: [PATCH 24/25] Do not install redis database as dep --- .github/workflows/macos.yml | 8 ++++---- scripts/docs/en/deps/macos.md | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 8b992a09aa43..93887f8e3a7d 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -59,7 +59,7 @@ jobs: - name: Install test dependencies run: | brew tap mongodb/brew - brew install clickhouse kafka mongodb-community + brew install clickhouse redis kafka mongodb-community - name: Setup ccache run: | @@ -82,7 +82,7 @@ jobs: - name: Run tests (samples) run: | cd build_debug/samples - # Fix Kafka and Rabbitmq after https://github.com/yandex/yandex-taxi-testsuite/pull/109 + # Fix Kafka and Rabbitmq after https://github.com/yandex/yandex-taxi-testsuite/pull/109 ctest -V -E "(kafka|mongo|rabbitmq)" - name: Run tests (core) @@ -111,14 +111,14 @@ jobs: ctest -V - name: Run tests (kafka) - if: false + if: false run: | # Enable after https://github.com/yandex/yandex-taxi-testsuite/pull/109 cd build_debug/kafka ctest -V - name: Run tests (rabbitmq) - if: false + if: false run: | # Enable after https://github.com/yandex/yandex-taxi-testsuite/pull/109 cd build_debug/rabbitmq diff --git a/scripts/docs/en/deps/macos.md b/scripts/docs/en/deps/macos.md index 5a2a6b2b01da..df455ef19b24 100644 --- a/scripts/docs/en/deps/macos.md +++ b/scripts/docs/en/deps/macos.md @@ -20,7 +20,6 @@ yaml-cpp librdkafka rocksdb postgresql@16 -redis zlib c-ares coreutils From 1d3f4c5f3e8d58c192eb3764d0b23e93daf6689e Mon Sep 17 00:00:00 2001 From: Fedor Osetrov <33493672+fdr400@users.noreply.github.com> Date: Sat, 28 Dec 2024 20:57:48 +0300 Subject: [PATCH 25/25] Update macos.yml --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 93887f8e3a7d..6631e054f6e6 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -88,7 +88,7 @@ jobs: - name: Run tests (core) run: | cd build_debug/core - ulimit -n 4096 && ctest -V -E userver-core-unittest -E testsuite-userver-core-tests-basic-chaos-tests-deadline # ~10 failed tests + ulimit -n 4096 && ctest -V -E "userver-core-unittest|testsuite-userver-core-tests-basic-chaos-tests-deadline" # ~10 failed tests - name: Run tests (libraries) run: |