Skip to content

Commit 2f66ecf

Browse files
DomPeliniAerospikeDomPeliniAerospike
authored
Merge pull request #633 from aerospike/Release-5.13.0
Release 5.13.0
2 parents a99b18f + d9acca7 commit 2f66ecf

File tree

215 files changed

+37087
-3882
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

215 files changed

+37087
-3882
lines changed

‎.github/assets/aerospike.conf

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
service {
2+
cluster-name nodejs-client
3+
}
4+
logging {
5+
console {
6+
context any info
7+
}
8+
}
9+
network {
10+
service {
11+
address any
12+
port 3000
13+
}
14+
heartbeat {
15+
address local
16+
interval 150
17+
mode mesh
18+
port 3002
19+
timeout 10
20+
}
21+
fabric {
22+
address local
23+
port 3001
24+
}
25+
}
26+
namespace test {
27+
allow-ttl-without-nsup true
28+
replication-factor 2
29+
storage-engine memory {
30+
data-size 1G
31+
}
32+
}
33+
namespace index_storage {
34+
allow-ttl-without-nsup true
35+
replication-factor 2
36+
storage-engine memory {
37+
data-size 1G
38+
}
39+
}

‎.github/workflows/build-bindings.yml

Lines changed: 72 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ jobs:
9494
nodejs: [
9595
["v108", 18],
9696
["v115", 20],
97-
["v127", 22]
97+
["v127", 22],
98+
["v131", 23]
9899
]
99100
platform: [
100101
"x86_64",
@@ -141,7 +142,9 @@ jobs:
141142

142143
- name: Run Aerospike server
143144
if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }}
144-
run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server
145+
run: |
146+
npm i @types/mocha @types/yargs @types/semver @types/chai;
147+
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
145148
146149
# - name: Set config.conf to use Docker IP address of Aerospike server
147150
# # config.conf should be copied into the cibuildwheel Docker container
@@ -154,7 +157,11 @@ jobs:
154157
# working-directory: test
155158

156159
- name: Enable tests
157-
run: echo "TEST_COMMAND=npm test -- --h 127.0.0.1 --port 3000" >> $GITHUB_ENV
160+
run: echo "TEST_COMMAND=cd ts-test;
161+
npm install typescript --save-dev;
162+
npx tsc;
163+
cd ..;
164+
npm run test dist/ -- --h 127.0.0.1 --port 3000" >> $GITHUB_ENV
158165

159166
# - name: Disable tests (only run basic import test)
160167
# if: ${{ !inputs.run_tests }}
@@ -215,7 +222,8 @@ jobs:
215222
nodejs: [
216223
["v108", 18],
217224
["v115", 20],
218-
["v127", 22]
225+
["v127", 22],
226+
['v131', 23]
219227
]
220228
runs-on: macos-13
221229
steps:
@@ -529,51 +537,63 @@ jobs:
529537
cd testDir
530538
bun link aerospike
531539
532-
test-typescript-install:
533-
runs-on: ubuntu-22.04
534-
needs: [manylinux, macOS-x86]
535-
steps:
536-
- uses: actions/checkout@v2
537-
with:
538-
submodules: recursive
539-
540-
- uses: ./.github/workflows/combine-bindings/
541-
542-
- uses: actions/setup-node@v4
543-
with:
544-
node-version: ${{ env.LOWEST_SUPPORTED_NODEJS_VERSION }}
545-
architecture: 'x64'
546-
547-
- if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }}
548-
uses: docker/login-action@v3
549-
with:
550-
username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }}
551-
password: ${{ secrets.DOCKER_HUB_BOT_PW }}
552-
553-
554-
- name: Run Aerospike server release candidate with latest tag
555-
if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }}
556-
run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server-rc:latest
557-
558-
- name: Run Aerospike server
559-
if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }}
560-
run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server
561-
562-
- name: Modify the package.json
563-
run: |
564-
sudo npm install -g json
565-
json -I -f package.json -e "this.scripts.install=\"npm-run-all removeExtraBinaries build\""
566-
567-
- name: Run tests
568-
run: |
569-
mkdir my-aerospike-project
570-
cd my-aerospike-project
571-
npm init -y
572-
npm install typescript ts-node --save-dev
573-
npm install ..
574-
cp ../examples/typescript.ts index.ts
575-
npx tsc index.ts
576-
node index.js
577-
578-
579-
540+
# test-typescript-install:
541+
# runs-on: ubuntu-22.04
542+
# needs: [manylinux, macOS-x86]
543+
# steps:
544+
# - uses: actions/checkout@v2
545+
# with:
546+
# submodules: recursive
547+
#
548+
# - uses: ./.github/workflows/combine-bindings/
549+
#
550+
# - uses: actions/setup-node@v4
551+
# with:
552+
# node-version: ${{ env.LOWEST_SUPPORTED_NODEJS_VERSION }}
553+
# architecture: 'x64'
554+
#
555+
# - if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }}
556+
# uses: docker/login-action@v3
557+
# with:
558+
# username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }}
559+
# password: ${{ secrets.DOCKER_HUB_BOT_PW }}
560+
#
561+
#
562+
# - name: Run Aerospike server release candidate with latest tag
563+
# if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }}
564+
# run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server-rc:latest
565+
#
566+
# - name: Run Aerospike server
567+
# if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }}
568+
# run: |
569+
# cd ts-test;
570+
# npm i --save-dev @types/mocha;
571+
# npm i --save-dev @types/yargs;
572+
# npm i --save-dev @types/semver;
573+
# npm i --save-dev @types/chai;
574+
# tsc;
575+
# cd ..;
576+
# npm install;
577+
# docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server
578+
#
579+
#
580+
#
581+
# - name: Wait for database to be ready
582+
# # Should be ready after 3 seconds
583+
# run: sleep 15
584+
#
585+
# - name: Modify the package.json
586+
# run: |
587+
# sudo npm install -g json
588+
# json -I -f package.json -e "this.scripts.install=\"npm-run-all removeExtraBinaries build\""
589+
#
590+
# - name: Run tests
591+
# run: |
592+
# mkdir my-aerospike-project
593+
# cd my-aerospike-project
594+
# npm init -y
595+
# npm install typescript ts-node --save-dev
596+
# npm install ..
597+
# cp ../examples/typescript.ts index.ts
598+
# npx tsc index.ts
599+
# node index.js

‎.github/workflows/combine-bindings/action.yml

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,25 +56,36 @@ runs:
5656
# with:
5757
# name: v127-manylinux_aarch64.build
5858

59+
- uses: actions/download-artifact@v4
60+
with:
61+
name: v131-manylinux_x86_64.build
62+
63+
# - uses: actions/download-artifact@v4
64+
# with:
65+
# name: v131-manylinux_aarch64.build
66+
5967
- name: Install client
6068
shell: bash
6169
run: |
62-
mkdir -p lib/binding/node-v108-darwin-arm64 lib/binding/node-v115-darwin-arm64 lib/binding/node-v127-darwin-arm64
63-
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
64-
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
65-
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
66-
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
67-
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
68-
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
70+
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
71+
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
72+
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
73+
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
74+
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
75+
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
76+
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
6977
cp -r node-v108-linux-x64 lib/binding/[email protected]/
7078
cp -r node-v115-linux-x64 lib/binding/[email protected]/
7179
cp -r node-v127-linux-x64 lib/binding/[email protected]/
7280
cp -r node-v108-darwin-x64 lib/binding/node-v108-darwin-x64
7381
cp -r node-v115-darwin-x64 lib/binding/node-v115-darwin-x64
7482
cp -r node-v127-darwin-x64 lib/binding/node-v127-darwin-x64
83+
cp -r node-v127-darwin-x64 lib/binding/node-v131-darwin-x64
7584
# cp -r node-v108-linux-arm64 lib/binding/node-v108-linux-arm64
7685
# cp -r node-v115-linux-arm64 lib/binding/node-v115-linux-arm64
7786
# cp -r node-v127-linux-arm64 lib/binding/node-v127-linux-arm64
87+
# cp -r node-v127-linux-arm64 lib/binding/node-v131-linux-arm64
7888
# cp -r node-v108-darwin-arm64 lib/binding/node-v108-darwin-arm64
7989
# cp -r node-v115-darwin-arm64 lib/binding/node-v115-darwin-arm64
80-
# cp -r node-v127-darwin-arm64 lib/binding/node-v127-darwin-arm64
90+
# cp -r node-v127-darwin-arm64 lib/binding/node-v127-darwin-arm64
91+
# cp -r node-v127-darwin-arm64 lib/binding/node-v131-darwin-arm64

0 commit comments

Comments
 (0)