diff --git a/.github/assets/aerospike.conf b/.github/assets/aerospike.conf index f5f3c4c6..6310f2d6 100644 --- a/.github/assets/aerospike.conf +++ b/.github/assets/aerospike.conf @@ -1,6 +1,5 @@ service { - cluster-name vector-search - feature-key-file /etc/aerospike/features.conf + cluster-name nodejs-client } logging { console { @@ -24,7 +23,6 @@ network { port 3001 } } - namespace test { allow-ttl-without-nsup true replication-factor 2 diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 3644a1a4..cb4bf96c 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -143,7 +143,7 @@ jobs: if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }} run: | npm i @types/mocha @types/yargs @types/semver @types/chai - docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server + run: 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 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e4e82e5a..ab0dd352 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -217,7 +217,7 @@ jobs: - name: Run Aerospike server if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }} - run: docker run -d -v $(pwd)/.github/assets/aerospike.conf:/etc/aerospike/aerospike.conf --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server --config-file /etc/aerospike/aerospike.conf + run: 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: Wait for database to be ready # Should be ready after 3 seconds @@ -229,7 +229,7 @@ jobs: npm install typescript --save-dev; npx tsc; cd ..; - npm run ts-test + npm run ts-test dist/ test-lowest-supported-server: runs-on: ubuntu-latest @@ -275,7 +275,7 @@ jobs: npm install typescript --save-dev; npx tsc; cd ..; - npm run ts-test -- --t 20000 + npm run ts-test dist/ -- --t 20000 test-ee: runs-on: ubuntu-latest @@ -332,7 +332,7 @@ jobs: npm install typescript --save-dev; npx tsc; cd ..; - npm run ts-test tests/admin.js -- --h localhost --U admin --P admin --t 40000 + npm run ts-test dist/admin.js -- --h localhost --U admin --P admin --t 40000 test-valgrind: runs-on: ubuntu-latest @@ -387,7 +387,7 @@ jobs: - name: Run Aerospike server if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }} - run: docker run -d -v $(pwd)/.github/assets/aerospike.conf:/etc/aerospike/aerospike.conf --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server + run: 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: Wait for database to be ready # Should be ready after 3 seconds