Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update core to 1.0.2 #160

Closed
wants to merge 1 commit into from
Closed

Update core to 1.0.2 #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/linters.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
CB_SCAN_BUILD: /usr/bin/scan-build-18
- name: Upload scan-build report
if: ${{ failure() }}
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: report
path: ext/cmake-build-report.tar.gz
7 changes: 5 additions & 2 deletions ext/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,15 @@ add_library(
rcb_version.cxx
rcb_views.cxx)
target_include_directories(couchbase PRIVATE ${PROJECT_BINARY_DIR}/generated)
target_include_directories(couchbase PRIVATE SYSTEM ${RUBY_INCLUDE_DIR})
target_include_directories(couchbase PRIVATE SYSTEM ${RUBY_INCLUDE_DIR}
${PROJECT_SOURCE_DIR}/couchbase
${PROJECT_SOURCE_DIR}/couchbase/third_party/cxx_function
${PROJECT_SOURCE_DIR}/couchbase/third_party/expected/include)
target_link_libraries(
couchbase
PRIVATE project_options
project_warnings
couchbase_cxx_client
couchbase_cxx_client_static
Microsoft.GSL::GSL
asio
taocpp::json
Expand Down
2 changes: 1 addition & 1 deletion ext/couchbase
Open in desktop
Submodule couchbase updated from 58d46d to 51f477
3 changes: 3 additions & 0 deletions ext/extconf.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,13 @@ def sys(*cmd)
"-DRUBY_ARCH_HDR_DIR=#{RbConfig::CONFIG['rubyarchhdrdir']}",
"-DRUBY_LIBRARY_DIR=#{RbConfig::CONFIG['libdir']}",
"-DRUBY_LIBRUBYARG=#{RbConfig::CONFIG['LIBRUBYARG_SHARED']}",
"-DCOUCHBASE_CXX_CLIENT_BUILD_STATIC=ON",
"-DCOUCHBASE_CXX_CLIENT_BUILD_SHARED=OFF",
"-DCOUCHBASE_CXX_CLIENT_BUILD_TESTS=OFF",
"-DCOUCHBASE_CXX_CLIENT_BUILD_DOCS=OFF",
"-DCOUCHBASE_CXX_CLIENT_BUILD_TOOLS=OFF",
"-DCOUCHBASE_CXX_CLIENT_BUILD_EXAMPLES=OFF",
"-DCOUCHBASE_CXX_CLIENT_INSTALL=OFF",
]

extconf_include = File.expand_path("cache/extconf_include.rb", __dir__)
Expand Down
1 change: 0 additions & 1 deletion ext/rcb_backend.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,6 @@ initialize_cluster_options(const core::utils::connection_string& connstr,
static const auto sym_network = rb_id2sym(rb_intern("network"));
if (auto param = options::get_string(options, sym_network); param) {
cluster_options.network().preferred_network(param.value());
cluster_options.behavior().network(param.value());
}

static const auto sym_use_ip_protocol = rb_id2sym(rb_intern("use_ip_protocol"));
Expand Down
2 changes: 2 additions & 0 deletions ext/rcb_crud.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@
#include <core/operations/document_touch.hxx>
#include <core/operations/document_unlock.hxx>
#include <core/utils/json.hxx>

#include <couchbase/cluster.hxx>
#include <couchbase/codec/encoded_value.hxx>
#include <couchbase/codec/tao_json_serializer.hxx>
#include <couchbase/codec/transcoder_traits.hxx>

#include <future>
Expand Down
3 changes: 2 additions & 1 deletion ext/rcb_version.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ init_version(VALUE mCouchbase)
name == "mozilla_ca_bundle_size") {
rb_hash_aset(cb_CoreInfo, rb_id2sym(rb_intern(name.c_str())), INT2FIX(std::stoi(value)));
} else if (name == "snapshot" || name == "static_stdlib" || name == "static_openssl" ||
name == "static_boringssl" || name == "mozilla_ca_bundle_embedded") {
name == "static_boringssl" || name == "columnar" || name == "static_target" ||
name == "mozilla_ca_bundle_embedded") {
rb_hash_aset(
cb_CoreInfo, rb_id2sym(rb_intern(name.c_str())), value == "true" ? Qtrue : Qfalse);
} else {
Expand Down
Loading