diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2023-06-25 23:48:05 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2023-07-07 08:33:34 +0000 |
| commit | d75d1e8f1a18fd77ec9b80724c6d30ad6b8e064e (patch) | |
| tree | ab7bad4644e469872a8da1b678b07a988d2f38d9 | |
| parent | 2e6eb75c76c2d042eb07a8e6bcb4aa03b8843205 (diff) | |
GitHub actions: fix macOS jobv2.1.0
Use qbspkgconfig in proto examples.
Pass additional libs to proto/grpc tests.
Change-Id: Ic3018fcb5b2350610a4ab70b97efad1abaac9252
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | .github/workflows/main.yml | 2 | ||||
| -rw-r--r-- | examples/grpc/grpc.qbs | 1 | ||||
| -rw-r--r-- | examples/protobuf/addressbook_cpp/addressbook_cpp.qbs | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 53cbbe762..04409a79e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -611,7 +611,7 @@ jobs: QTEST_FUNCTION_TIMEOUT: 9000000 QBS_AUTOTEST_PROFILE: 'qt' QBS_TEST_SOURCE_ROOT: 'tests' - QBS_EXTRA_GRPC_LIBS: 'absl_synchronization,grpc,gpr' + QBS_EXTRA_GRPC_LIBS: 'absl_cord,absl_cordz_handle,absl_cordz_info,absl_synchronization,grpc,gpr' strategy: fail-fast: false matrix: diff --git a/examples/grpc/grpc.qbs b/examples/grpc/grpc.qbs index c4f146ec0..a25bf994e 100644 --- a/examples/grpc/grpc.qbs +++ b/examples/grpc/grpc.qbs @@ -32,6 +32,7 @@ import qbs.Utilities Project { condition: Utilities.versionCompare(qbs.version, "1.14") >= 0 + qbsModuleProviders: "qbspkgconfig" Application { Depends { name: "cpp" } diff --git a/examples/protobuf/addressbook_cpp/addressbook_cpp.qbs b/examples/protobuf/addressbook_cpp/addressbook_cpp.qbs index 717f5d84d..95fb1c1e3 100644 --- a/examples/protobuf/addressbook_cpp/addressbook_cpp.qbs +++ b/examples/protobuf/addressbook_cpp/addressbook_cpp.qbs @@ -14,4 +14,5 @@ CppApplication { "main.cpp", "README.md", ] + qbsModuleProviders: "qbspkgconfig" } |