Skip to content

Commit dad2fe3

Browse files
committed
feat(all): add support for api 630
1 parent f41fa13 commit dad2fe3

File tree

12 files changed

+860
-6
lines changed

12 files changed

+860
-6
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ jobs:
2323

2424
- name: Install FoundationDB
2525
uses: Clikengo/foundationdb-actions-install@v1
26+
with:
27+
version: "6.3.15"
2628

2729
- name: Install Clang
2830
if: matrix.os == 'windows-latest'
@@ -63,6 +65,12 @@ jobs:
6365
command: test
6466
args: --manifest-path foundationdb/Cargo.toml --features num-bigint --tests
6567

68+
- name: Test 6.3
69+
uses: actions-rs/cargo@v1
70+
with:
71+
command: test
72+
args: --manifest-path foundationdb/Cargo.toml --no-default-features --features fdb-6_3 --tests
73+
6674
- name: Test 6.2
6775
uses: actions-rs/cargo@v1
6876
with:

.github/workflows/rustdoc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ jobs:
1616

1717
- name: Install FoundationDB
1818
uses: Clikengo/foundationdb-actions-install@v1
19+
with:
20+
version: "6.3.15"
1921

2022
- name: Install Rust toolchain
2123
uses: actions-rs/toolchain@v1

foundationdb-bindingtester/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,15 @@ categories = ["database"]
2020
license = "MIT/Apache-2.0"
2121

2222
[features]
23-
default = ["fdb-6_2"]
23+
default = ["fdb-6_3"]
2424
# Use the locally embedded foundationdb fdb_c.h and fdb.options files
2525
embedded-fdb-include = ["foundationdb/embedded-fdb-include"]
2626
fdb-5_1 = ["foundationdb/fdb-5_1"]
2727
fdb-5_2 = ["foundationdb/fdb-5_2"]
2828
fdb-6_0 = ["foundationdb/fdb-6_0"]
2929
fdb-6_1 = ["foundationdb/fdb-6_1"]
3030
fdb-6_2 = ["foundationdb/fdb-6_2"]
31+
fdb-6_3 = ["foundationdb/fdb-6_3"]
3132

3233
[dependencies]
3334
env_logger = "0.7.1"

foundationdb-gen/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,15 @@ features = ["embedded-fdb-include"]
2626
codecov = { repository = "Clikengo/foundationdb-rs", branch = "master", service = "github" }
2727

2828
[features]
29-
default = ["fdb-6_2"]
29+
default = ["fdb-6_3"]
3030
# Use the locally embedded foundationdb fdb.options file
3131
embedded-fdb-include = []
3232
fdb-5_1 = []
3333
fdb-5_2 = []
3434
fdb-6_0 = []
3535
fdb-6_1 = []
3636
fdb-6_2 = []
37+
fdb-6_3 = []
3738

3839
[dependencies]
3940
xml-rs = "0.8.0"

foundationdb-gen/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,8 @@ const OPTIONS_DATA: &[u8] = include_bytes!("../include/600/fdb.options");
366366
const OPTIONS_DATA: &[u8] = include_bytes!("../include/610/fdb.options");
367367
#[cfg(all(feature = "embedded-fdb-include", feature = "fdb-6_2"))]
368368
const OPTIONS_DATA: &[u8] = include_bytes!("../include/620/fdb.options");
369+
#[cfg(all(feature = "embedded-fdb-include", feature = "fdb-6_3"))]
370+
const OPTIONS_DATA: &[u8] = include_bytes!("../include/630/fdb.options");
369371

370372
pub fn emit(w: &mut impl fmt::Write) -> fmt::Result {
371373
let mut reader = OPTIONS_DATA;

foundationdb-sys/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,15 @@ features = ["embedded-fdb-include"]
2727
codecov = { repository = "Clikengo/foundationdb-rs", branch = "master", service = "github" }
2828

2929
[features]
30-
default = ["fdb-6_2"]
30+
default = ["fdb-6_3"]
3131
# Use the locally embedded foundationdb fdb_c.h file
3232
embedded-fdb-include = []
3333
fdb-5_1 = []
3434
fdb-5_2 = []
3535
fdb-6_0 = []
3636
fdb-6_1 = []
3737
fdb-6_2 = []
38+
fdb-6_3 = []
3839

3940
[dependencies]
4041

foundationdb-sys/build.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ const INCLUDE_PATH: &str = "-I./include/600";
2424
const INCLUDE_PATH: &str = "-I./include/610";
2525
#[cfg(all(feature = "embedded-fdb-include", feature = "fdb-6_2"))]
2626
const INCLUDE_PATH: &str = "-I./include/620";
27+
#[cfg(all(feature = "embedded-fdb-include", feature = "fdb-6_3"))]
28+
const INCLUDE_PATH: &str = "-I./include/630";
2729

2830
fn main() {
2931
// Link against fdb_c.
@@ -63,6 +65,10 @@ fn main() {
6365
{
6466
api_version = 620;
6567
}
68+
#[cfg(feature = "fdb-6_3")]
69+
{
70+
api_version = 630;
71+
}
6672

6773
// Sigh, bindgen only takes a String for its header path, but that's UTF-8 while
6874
// PathBuf is OS-native...

0 commit comments

Comments
 (0)