Skip to content

Commit 53a5c48

Browse files
authored
Prepare for bcr (#37)
Make the repo ready for bcr
1 parent 969067f commit 53a5c48

15 files changed

Lines changed: 7636 additions & 4277 deletions

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.0.0
1+
9.1.0

.github/workflows/build-bazel.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,8 @@ jobs:
3232

3333
- name: Test (fastbuild)
3434
run: bazel test //...
35+
36+
- name: Test BCR consumer module
37+
if: matrix.os == 'ubuntu-latest'
38+
working-directory: tests/bcr-consumer
39+
run: bazel test --lockfile_mode=off //:consumer_test

BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ cc_library(
4646
],
4747
strip_include_prefix = "include",
4848
deps = [
49-
"//sqlite",
49+
"@sqlite//:sqlite3",
5050
],
5151
)

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ set(sl3_MINOR_VERSION 3)
66

77
# sqlite major is always 3, no need to use that here
88
# set(internal_SQLITE_MAJOR_V 3)
9-
set(internal_SQLITE_MINOR_V 51)
10-
set(internal_SQLITE_PATCH_V 3)
9+
set(internal_SQLITE_MINOR_V 53)
10+
set(internal_SQLITE_PATCH_V 1)
1111

1212
# sqlite uses (X*1000000 + Y*1000 + Z),
1313
# but minor patch used since major is always 3

MODULE.bazel

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
"""libsl3 - A C++ wrapper for SQLite3"""
22

33
# SQLite version configuration - single source of truth
4-
SQLITE3_MINOR = 51
4+
SQLITE3_MINOR = 53
55

6-
SQLITE3_PATCH = 3
6+
SQLITE3_PATCH = 1
77

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

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

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

MODULE.bazel.lock

Lines changed: 10 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmake/project-setup.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include_guard(GLOBAL)
22
# Keep this here for now, but add a CI test that builds with 20 or 17
33
set(CMAKE_CXX_STANDARD_REQUIRED ON)
44
set(CMAKE_CXX_EXTENSIONS OFF)
5-
set(CMAKE_CXX_STANDARD 23)
5+
set(CMAKE_CXX_STANDARD 17)
66

77
set(CMAKE_C_STANDARD_REQUIRED ON)
88
set(CMAKE_C_EXTENSIONS OFF)

sqlite/BUILD.bazel

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)