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.

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

Release 5.13.0 #633

Merged
merged 63 commits into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
bf964c3
CLIENT-3107
DomPeliniAerospike Oct 14, 2024
a8865c0
C Submodule update
DomPeliniAerospike Oct 14, 2024
74a7b76
Merge branch 'stage' into Release-5.13.0
DomPeliniAerospike Oct 14, 2024
1ce94ef
Ran standard lint
DomPeliniAerospike Oct 14, 2024
af44497
Merge branch 'Release-5.13.0' of https://github.com/aerospike/aerospi…
DomPeliniAerospike Oct 14, 2024
4213113
test fix
DomPeliniAerospike Oct 14, 2024
c01613c
test fix
DomPeliniAerospike Oct 14, 2024
b5b28d1
test fix
DomPeliniAerospike Oct 14, 2024
4811cdb
test fix
DomPeliniAerospike Oct 15, 2024
342c71e
test fix
DomPeliniAerospike Oct 15, 2024
6c1fd88
test fix
DomPeliniAerospike Oct 15, 2024
e995cb1
test fix
DomPeliniAerospike Oct 16, 2024
92a951e
test fix
DomPeliniAerospike Oct 16, 2024
1dfe330
test fix
DomPeliniAerospike Oct 16, 2024
1dadf4a
test fix
DomPeliniAerospike Oct 16, 2024
e4a7b22
test fix
DomPeliniAerospike Oct 16, 2024
b4fc06b
test fix
DomPeliniAerospike Oct 16, 2024
5299257
test fix
DomPeliniAerospike Oct 16, 2024
6a60b57
test fix
DomPeliniAerospike Oct 16, 2024
fa60652
test fix
DomPeliniAerospike Oct 17, 2024
6c0dc59
test fix
DomPeliniAerospike Oct 17, 2024
effa230
test fix
DomPeliniAerospike Oct 17, 2024
1d4421b
test fix
DomPeliniAerospike Oct 17, 2024
a1de457
test fix
DomPeliniAerospike Oct 17, 2024
4c02c07
test fix
DomPeliniAerospike Oct 17, 2024
57784a9
test fix
DomPeliniAerospike Oct 17, 2024
a993110
test fix
DomPeliniAerospike Oct 17, 2024
9315d3b
test fix
DomPeliniAerospike Oct 17, 2024
306d891
test fix
DomPeliniAerospike Oct 17, 2024
e8739b5
test fix
DomPeliniAerospike Oct 17, 2024
05c8b1f
test fix
DomPeliniAerospike Oct 17, 2024
ad50ccf
test fix
DomPeliniAerospike Oct 17, 2024
d4cbb2c
test fix
DomPeliniAerospike Oct 17, 2024
2caf663
test fix
DomPeliniAerospike Oct 17, 2024
69cc744
test fix
DomPeliniAerospike Oct 17, 2024
5eacaf5
test fix
DomPeliniAerospike Oct 17, 2024
f77018d
test fix
DomPeliniAerospike Oct 17, 2024
b28032e
test fix
DomPeliniAerospike Oct 17, 2024
8b540dd
test fix
DomPeliniAerospike Oct 17, 2024
447a241
test fix
DomPeliniAerospike Oct 17, 2024
6931477
test fix
DomPeliniAerospike Oct 21, 2024
882fc4b
test fix
DomPeliniAerospike Oct 21, 2024
ed13719
test fix
DomPeliniAerospike Oct 21, 2024
95ab857
test fix
DomPeliniAerospike Oct 21, 2024
894768b
test fix
DomPeliniAerospike Oct 21, 2024
5b5c6b9
test fix
DomPeliniAerospike Oct 21, 2024
b706f93
test fix
DomPeliniAerospike Oct 21, 2024
9bbd1ab
test fix
DomPeliniAerospike Oct 21, 2024
6d29808
test fix
DomPeliniAerospike Oct 21, 2024
ab8c5f6
test fix
DomPeliniAerospike Oct 21, 2024
882148d
test fix
DomPeliniAerospike Oct 21, 2024
e6bdca4
test fix
DomPeliniAerospike Oct 21, 2024
ab6a192
test fix
DomPeliniAerospike Oct 21, 2024
a571d3c
test fix
DomPeliniAerospike Oct 21, 2024
6ad55d2
Updated copyright info
DomPeliniAerospike Oct 21, 2024
03ba5f4
typo fix
DomPeliniAerospike Oct 21, 2024
e8944a3
Fixed some documentation. Fixed tsconfig.json. changed C Client submo…
DomPeliniAerospike Oct 21, 2024
c235fc2
Fixed some documentation. Fixed tsconfig.json. changed C Client submo…
DomPeliniAerospike Oct 21, 2024
3248c9e
Added node 23 to supported versions. Updated nan dependency.
DomPeliniAerospike Oct 22, 2024
32d80a3
Test fix
DomPeliniAerospike Oct 22, 2024
410532c
Test fix
DomPeliniAerospike Oct 22, 2024
56744ba
Test fix
DomPeliniAerospike Oct 22, 2024
d9acca7
Test fix
DomPeliniAerospike Oct 22, 2024
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
39 changes: 39 additions & 0 deletions .github/assets/aerospike.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
service {
cluster-name nodejs-client
}
logging {
console {
context any info
}
}
network {
service {
address any
port 3000
}
heartbeat {
address local
interval 150
mode mesh
port 3002
timeout 10
}
fabric {
address local
port 3001
}
}
namespace test {
allow-ttl-without-nsup true
replication-factor 2
storage-engine memory {
data-size 1G
}
}
namespace index_storage {
allow-ttl-without-nsup true
replication-factor 2
storage-engine memory {
data-size 1G
}
}
124 changes: 72 additions & 52 deletions .github/workflows/build-bindings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ jobs:
nodejs: [
["v108", 18],
["v115", 20],
["v127", 22]
["v127", 22],
["v131", 23]
]
platform: [
"x86_64",
Expand Down Expand Up @@ -141,7 +142,9 @@ jobs:

- name: Run Aerospike server
if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }}
run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server
run: |
npm i @types/mocha @types/yargs @types/semver @types/chai;
docker run -d -v $(pwd)/.github/assets/aerospike.conf:/etc/mail/aerospike.conf --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server --config-file /etc/mail/aerospike.conf

# - name: Set config.conf to use Docker IP address of Aerospike server
# # config.conf should be copied into the cibuildwheel Docker container
Expand All @@ -154,7 +157,11 @@ jobs:
# working-directory: test

- name: Enable tests
run: echo "TEST_COMMAND=npm test -- --h 127.0.0.1 --port 3000" >> $GITHUB_ENV
run: echo "TEST_COMMAND=cd ts-test;
npm install typescript --save-dev;
npx tsc;
cd ..;
npm run test dist/ -- --h 127.0.0.1 --port 3000" >> $GITHUB_ENV

# - name: Disable tests (only run basic import test)
# if: ${{ !inputs.run_tests }}
Expand Down Expand Up @@ -215,7 +222,8 @@ jobs:
nodejs: [
["v108", 18],
["v115", 20],
["v127", 22]
["v127", 22],
['v131', 23]
]
runs-on: macos-13
steps:
Expand Down Expand Up @@ -529,51 +537,63 @@ jobs:
cd testDir
bun link aerospike

test-typescript-install:
runs-on: ubuntu-22.04
needs: [manylinux, macOS-x86]
steps:
- uses: actions/checkout@v2
with:
submodules: recursive

- uses: ./.github/workflows/combine-bindings/

- uses: actions/setup-node@v4
with:
node-version: ${{ env.LOWEST_SUPPORTED_NODEJS_VERSION }}
architecture: 'x64'

- if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }}
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }}
password: ${{ secrets.DOCKER_HUB_BOT_PW }}


- name: Run Aerospike server release candidate with latest tag
if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }}
run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server-rc:latest

- name: Run Aerospike server
if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }}
run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server

- name: Modify the package.json
run: |
sudo npm install -g json
json -I -f package.json -e "this.scripts.install=\"npm-run-all removeExtraBinaries build\""

- name: Run tests
run: |
mkdir my-aerospike-project
cd my-aerospike-project
npm init -y
npm install typescript ts-node --save-dev
npm install ..
cp ../examples/typescript.ts index.ts
npx tsc index.ts
node index.js



# test-typescript-install:
# runs-on: ubuntu-22.04
# needs: [manylinux, macOS-x86]
# steps:
# - uses: actions/checkout@v2
# with:
# submodules: recursive
#
# - uses: ./.github/workflows/combine-bindings/
#
# - uses: actions/setup-node@v4
# with:
# node-version: ${{ env.LOWEST_SUPPORTED_NODEJS_VERSION }}
# architecture: 'x64'
#
# - if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }}
# uses: docker/login-action@v3
# with:
# username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }}
# password: ${{ secrets.DOCKER_HUB_BOT_PW }}
#
#
# - name: Run Aerospike server release candidate with latest tag
# if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }}
# run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server-rc:latest
#
# - name: Run Aerospike server
# if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }}
# run: |
# cd ts-test;
# npm i --save-dev @types/mocha;
# npm i --save-dev @types/yargs;
# npm i --save-dev @types/semver;
# npm i --save-dev @types/chai;
# tsc;
# cd ..;
# npm install;
# docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server
#
#
#
# - name: Wait for database to be ready
# # Should be ready after 3 seconds
# run: sleep 15
#
# - name: Modify the package.json
# run: |
# sudo npm install -g json
# json -I -f package.json -e "this.scripts.install=\"npm-run-all removeExtraBinaries build\""
#
# - name: Run tests
# run: |
# mkdir my-aerospike-project
# cd my-aerospike-project
# npm init -y
# npm install typescript ts-node --save-dev
# npm install ..
# cp ../examples/typescript.ts index.ts
# npx tsc index.ts
# node index.js
27 changes: 19 additions & 8 deletions .github/workflows/combine-bindings/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,25 +56,36 @@ runs:
# with:
# name: v127-manylinux_aarch64.build

- uses: actions/download-artifact@v4
with:
name: v131-manylinux_x86_64.build

# - uses: actions/download-artifact@v4
# with:
# name: v131-manylinux_aarch64.build

- name: Install client
shell: bash
run: |
mkdir -p lib/binding/node-v108-darwin-arm64 lib/binding/node-v115-darwin-arm64 lib/binding/node-v127-darwin-arm64
mkdir -p lib/binding/[email protected]/node-v108-linux-arm64 lib/binding/[email protected]/node-v115-linux-arm64 lib/binding/[email protected]/node-v127-linux-arm64
mkdir -p lib/binding/[email protected]/node-v108-linux-arm64 lib/binding/[email protected]/node-v115-linux-arm64 lib/binding/[email protected]/node-v127-linux-arm64
mkdir -p lib/binding/[email protected]/node-v108-linux-arm64 lib/binding/[email protected]/node-v115-linux-arm64 lib/binding/[email protected]/node-v127-linux-arm64
mkdir -p lib/binding/[email protected]/node-v108-linux-x64 lib/binding/[email protected]/node-v115-linux-x64 lib/binding/[email protected]/node-v127-linux-x64
mkdir -p lib/binding/[email protected]/node-v108-linux-x64 lib/binding/[email protected]/node-v115-linux-x64 lib/binding/[email protected]/node-v127-linux-x64
mkdir -p lib/binding/[email protected]/node-v108-linux-x64 lib/binding/[email protected]/node-v115-linux-x64 lib/binding/[email protected]/node-v127-linux-x64
mkdir -p lib/binding/node-v108-darwin-arm64 lib/binding/node-v115-darwin-arm64 lib/binding/node-v127-darwin-arm64 lib/binding/node-v131-darwin-arm64
mkdir -p lib/binding/[email protected]/node-v108-linux-arm64 lib/binding/[email protected]/node-v115-linux-arm64 lib/binding/[email protected]/node-v127-linux-arm64 lib/binding/[email protected]/node-v131-linux-arm64
mkdir -p lib/binding/[email protected]/node-v108-linux-arm64 lib/binding/[email protected]/node-v115-linux-arm64 lib/binding/[email protected]/node-v127-linux-arm64 lib/binding/[email protected]/node-v131-linux-arm64
mkdir -p lib/binding/[email protected]/node-v108-linux-arm64 lib/binding/[email protected]/node-v115-linux-arm64 lib/binding/[email protected]/node-v127-linux-arm64 lib/binding/[email protected]/node-v131-linux-arm64
mkdir -p lib/binding/[email protected]/node-v108-linux-x64 lib/binding/[email protected]/node-v115-linux-x64 lib/binding/[email protected]/node-v127-linux-x64 lib/binding/[email protected]/node-v131-linux-x64
mkdir -p lib/binding/[email protected]/node-v108-linux-x64 lib/binding/[email protected]/node-v115-linux-x64 lib/binding/[email protected]/node-v127-linux-x64 lib/binding/[email protected]/node-v131-linux-x64
mkdir -p lib/binding/[email protected]/node-v108-linux-x64 lib/binding/[email protected]/node-v115-linux-x64 lib/binding/[email protected]/node-v127-linux-x64 lib/binding/[email protected]/node-v131-linux-x64
cp -r node-v108-linux-x64 lib/binding/[email protected]/
cp -r node-v115-linux-x64 lib/binding/[email protected]/
cp -r node-v127-linux-x64 lib/binding/[email protected]/
cp -r node-v108-darwin-x64 lib/binding/node-v108-darwin-x64
cp -r node-v115-darwin-x64 lib/binding/node-v115-darwin-x64
cp -r node-v127-darwin-x64 lib/binding/node-v127-darwin-x64
cp -r node-v127-darwin-x64 lib/binding/node-v131-darwin-x64
# cp -r node-v108-linux-arm64 lib/binding/node-v108-linux-arm64
# cp -r node-v115-linux-arm64 lib/binding/node-v115-linux-arm64
# cp -r node-v127-linux-arm64 lib/binding/node-v127-linux-arm64
# cp -r node-v127-linux-arm64 lib/binding/node-v131-linux-arm64
# cp -r node-v108-darwin-arm64 lib/binding/node-v108-darwin-arm64
# cp -r node-v115-darwin-arm64 lib/binding/node-v115-darwin-arm64
# cp -r node-v127-darwin-arm64 lib/binding/node-v127-darwin-arm64
# cp -r node-v127-darwin-arm64 lib/binding/node-v127-darwin-arm64
# cp -r node-v127-darwin-arm64 lib/binding/node-v131-darwin-arm64
Loading
Loading