Skip to content

Commit

Permalink
update apiVersion from 720 to 730 (#86)
Browse files Browse the repository at this point in the history
* Update fdbversion.h

* Update apiVersion.ts

* Update buildmod.yml to v7.3

* Update node.js.yml to v7.3

* Update CHANGELOG.md to reflect a new release to support 7.3
  • Loading branch information
nickchomey authored Feb 18, 2025
1 parent fcc4d3c commit 0dcc027
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 17 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/buildmod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ jobs:
with:
node-version: 18

- run: wget -nv "https://github.com/apple/foundationdb/releases/download/7.2.5/foundationdb-clients_7.2.5-1_amd64.deb"
- run: sudo dpkg -i foundationdb-clients_7.2.5-1_amd64.deb
- run: wget -nv "https://github.com/apple/foundationdb/releases/download/7.3.59/foundationdb-clients_7.3.59-1_amd64.deb"
- run: sudo dpkg -i foundationdb-clients_7.3.59-1_amd64.deb
- run: sudo mkdir -p /var/lib/foundationdb/data
- run: wget -nv "https://github.com/apple/foundationdb/releases/download/7.2.5/foundationdb-server_7.2.5-1_amd64.deb"
- run: sudo dpkg -i foundationdb-server_7.2.5-1_amd64.deb
- run: wget -nv "https://github.com/apple/foundationdb/releases/download/7.3.59/foundationdb-server_7.3.59-1_amd64.deb"
- run: sudo dpkg -i foundationdb-server_7.3.59-1_amd64.deb

- run: yarn
- run: yarn prebuild
Expand All @@ -48,8 +48,8 @@ jobs:
node-version: 14

# x86 first.
- run: wget -nv "https://github.com/apple/foundationdb/releases/download/7.2.5/FoundationDB-7.2.5_x86_64.pkg"
- run: sudo installer -pkg FoundationDB-7.2.5_x86_64.pkg -target /
- run: wget -nv "https://github.com/apple/foundationdb/releases/download/7.3.59/FoundationDB-7.3.59_x86_64.pkg"
- run: sudo installer -pkg FoundationDB-7.3.59_x86_64.pkg -target /

- run: yarn
- run: yarn test
Expand All @@ -58,8 +58,8 @@ jobs:
- run: yarn prebuild --arch x64

# Now install the arm version of the package and build for ARM. (Cross-compiling doesn't work otherwise - not sure why)
- run: wget -nv "https://github.com/apple/foundationdb/releases/download/7.2.5/FoundationDB-7.2.5_arm64.pkg"
- run: sudo installer -pkg FoundationDB-7.2.5_arm64.pkg -target /
- run: wget -nv "https://github.com/apple/foundationdb/releases/download/7.3.59/FoundationDB-7.3.59_arm64.pkg"
- run: sudo installer -pkg FoundationDB-7.3.59_arm64.pkg -target /

- run: yarn prebuild --arch arm64

Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:

# # Bleh - the 7.xx builds are currently missing one of the header files. More detail here:
# # https://forums.foundationdb.org/t/fdb-c-types-h-missing-in-windows-install-image/3817
# - run: (new-object net.webclient).DownloadFile('https://github.com/apple/foundationdb/releases/download/7.2.5/foundationdb-7.2.5-x64.msi', 'c:\foundationdb.msi')
# - run: (new-object net.webclient).DownloadFile('https://github.com/apple/foundationdb/releases/download/7.3.59/foundationdb-7.3.59-x64.msi', 'c:\foundationdb.msi')
# - run: dir c:\foundationdb.msi
# - run: msiexec /i c:\foundationdb.msi /quiet /passive /norestart /log install.log | Out-Null

Expand Down Expand Up @@ -136,8 +136,8 @@ jobs:
- run: ls -R prebuilds

# Ideally I shouldn't need this...
- run: wget -nv "https://github.com/apple/foundationdb/releases/download/7.2.5/foundationdb-clients_7.2.5-1_amd64.deb"
- run: sudo dpkg -i foundationdb-clients_7.2.5-1_amd64.deb
- run: wget -nv "https://github.com/apple/foundationdb/releases/download/7.3.59/foundationdb-clients_7.3.59-1_amd64.deb"
- run: sudo dpkg -i foundationdb-clients_7.3.59-1_amd64.deb

# And I could just run the linux script last anyway.
- run: yarn
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ jobs:
with:
node-version: ${{ matrix.node-version }}

- run: wget "https://github.com/apple/foundationdb/releases/download/7.2.5/foundationdb-clients_7.2.5-1_amd64.deb"
- run: sudo dpkg -i foundationdb-clients_7.2.5-1_amd64.deb
- run: wget "https://github.com/apple/foundationdb/releases/download/7.3.59/foundationdb-clients_7.3.59-1_amd64.deb"
- run: sudo dpkg -i foundationdb-clients_7.3.59-1_amd64.deb
- run: sudo mkdir -p /var/lib/foundationdb/data
- run: wget "https://github.com/apple/foundationdb/releases/download/7.2.5/foundationdb-server_7.2.5-1_amd64.deb"
- run: sudo dpkg -i foundationdb-server_7.2.5-1_amd64.deb
- run: wget "https://github.com/apple/foundationdb/releases/download/7.3.59/foundationdb-server_7.3.59-1_amd64.deb"
- run: sudo dpkg -i foundationdb-server_7.3.59-1_amd64.deb

- run: yarn
- run: yarn test
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# HEAD

# 2.0.2
- Updated to support FoundationDB API version 730.
- This means node-foundationdb requires foundationdb-clients 7.3 (which is the only version currently supported by the FoundationDB team) or newer to build

# 2.0.1

- Added native support for apple silicon (arm64). This has been way too long coming. Thanks to everyone who contributed on [the github issue](https://github.com/josephg/node-foundationdb/issues/50). The library should automatically detect your computer's architecture and "just work". You will need to install a version of foundationdb which matches your computer's architecture.
Expand Down
2 changes: 1 addition & 1 deletion lib/apiVersion.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import nativeMod from './native'
// To update:
// - regenerate lib/opts.g.ts using scripts/gentsopts.ts
// - re-run the test suite and binding test suite
export const MAX_VERSION = 720
export const MAX_VERSION = 730

let apiVersion: number | null = null
export const get = () => apiVersion
Expand Down
2 changes: 1 addition & 1 deletion src/fdbversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
#ifndef FDB_NODE_VERSION_H
#define FDB_NODE_VERSION_H

#define FDB_API_VERSION 720
#define FDB_API_VERSION 730

#endif

0 comments on commit 0dcc027

Please sign in to comment.