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
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.0.0
9.1.0
5 changes: 5 additions & 0 deletions .github/workflows/build-bazel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,8 @@ jobs:

- name: Test (fastbuild)
run: bazel test //...

- name: Test BCR consumer module
if: matrix.os == 'ubuntu-latest'
working-directory: tests/bcr-consumer
run: bazel test --lockfile_mode=off //:consumer_test
2 changes: 1 addition & 1 deletion BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@ cc_library(
],
strip_include_prefix = "include",
deps = [
"//sqlite",
"@sqlite//:sqlite3",
],
)
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ set(sl3_MINOR_VERSION 3)

# sqlite major is always 3, no need to use that here
# set(internal_SQLITE_MAJOR_V 3)
set(internal_SQLITE_MINOR_V 51)
set(internal_SQLITE_PATCH_V 3)
set(internal_SQLITE_MINOR_V 53)
set(internal_SQLITE_PATCH_V 1)

# sqlite uses (X*1000000 + Y*1000 + Z),
# but minor patch used since major is always 3
Expand Down
9 changes: 5 additions & 4 deletions MODULE.bazel
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
"""libsl3 - A C++ wrapper for SQLite3"""

# SQLite version configuration - single source of truth
SQLITE3_MINOR = 51
SQLITE3_MINOR = 53

SQLITE3_PATCH = 3
SQLITE3_PATCH = 1

SQLITE3_VERSION = "3.{}.{}".format(SQLITE3_MINOR, SQLITE3_PATCH)

Expand All @@ -18,5 +18,6 @@ bazel_dep(name = "platforms", version = "1.1.0")

# Library dependencies from the Bazel Central Registry
bazel_dep(name = "doctest", version = "2.4.12.bcr.1")
# sqlite can be done, but use the own one sice bcr is sometimes slow to catch up with versions
# bazel_dep(name = "sqlite3", version = SQLITE3_VERSION, repo_name = "sqlite")

# SQLite from BCR
bazel_dep(name = "sqlite3", version = SQLITE3_VERSION, repo_name = "sqlite")
17 changes: 10 additions & 7 deletions MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmake/project-setup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include_guard(GLOBAL)
# Keep this here for now, but add a CI test that builds with 20 or 17
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD 23)
set(CMAKE_CXX_STANDARD 17)

set(CMAKE_C_STANDARD_REQUIRED ON)
set(CMAKE_C_EXTENSIONS OFF)
Expand Down
23 changes: 0 additions & 23 deletions sqlite/BUILD.bazel

This file was deleted.

Loading
Loading