test fix

aerospike · Oct 16, 2024 · 6a60b57 · 6a60b57
1 parent 5299257
commit 6a60b57
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 47 deletions.
diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml
@@ -141,7 +141,7 @@ 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 -v .:./github/assets/aerospike.conf
+      run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server --config-file ./github/assets/aerospike.conf
 
 #    - name: Set config.conf to use Docker IP address of Aerospike server
 #      # config.conf should be copied into the cibuildwheel Docker container
@@ -256,7 +256,7 @@ 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 -v .:./github/assets/aerospike.conf
+#      run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server --config-file ./github/assets/aerospike.conf
 #
 #    - name: Enable tests
 #      run: echo "TEST_COMMAND=npm test -- --h 127.0.0.1 --port 3000 --t 30000" >> $GITHUB_ENV
@@ -557,7 +557,7 @@ 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 -v .:./github/assets/aerospike.conf
+      run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server --config-file ./github/assets/aerospike.conf
 
     - name: Modify the package.json
       run: |

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -159,28 +159,16 @@ jobs:
       # Should be ready after 3 seconds
       run: sleep 3
 
-#    - name: Compile Typescript
-#      run: tsc
-#      working-directory: ts-test
-# 
-#    - name: Setup for Typescript
-#      run: |
-#        npm i --save-dev @types/mocha;
-#        npm i --save-dev @types/yargs;
-#        npm i --save-dev @types/semver;
-#        npm i --save-dev @types/chai;
-#        npm install aerospike
-#      working-directory: ts-test
-
     - name: Run tests
       run: |
-        tsc
+        
         npm i --save-dev @types/mocha;
         npm i --save-dev @types/yargs;
         npm i --save-dev @types/semver;
         npm i --save-dev @types/chai;
-        npm install aerospike
-        npm run ts-test
+        npm install aerospike;
+        tsc;
+        npm run ts-test;
 
   test-ce:
     runs-on: ubuntu-latest
@@ -243,28 +231,16 @@ jobs:
       # Should be ready after 3 seconds
       run: sleep 3
 
-#    - name: Compile Typescript
-#      run: tsc
-#      working-directory: ts-test
-# 
-#    - name: Setup for Typescript
-#      run: |
-#        npm i --save-dev @types/mocha;
-#        npm i --save-dev @types/yargs;
-#        npm i --save-dev @types/semver;
-#        npm i --save-dev @types/chai;
-#        npm install aerospike
-#      working-directory: ts-test
-
     - name: Run tests
       run: |
-        tsc
+        
         npm i --save-dev @types/mocha;
         npm i --save-dev @types/yargs;
         npm i --save-dev @types/semver;
         npm i --save-dev @types/chai;
-        npm install aerospike
-        npm run ts-test
+        npm install aerospike;
+        tsc;
+        npm run ts-test;
 
   test-lowest-supported-server:
     runs-on: ubuntu-latest
@@ -304,17 +280,16 @@ jobs:
       # Should be ready after 3 seconds
       run: sleep 3
 
-    - name: Compile Typescript
-      run: tsc
-      working-directory: ts-test
+
 
     - name: Setup for Typescript
       run: |
         npm i --save-dev @types/mocha;
         npm i --save-dev @types/yargs;
         npm i --save-dev @types/semver;
         npm i --save-dev @types/chai;
-        npm install aerospike
+        npm install aerospike;
+        tsc;
       working-directory: ts-test
 
     - name: Run tests
@@ -368,21 +343,15 @@ jobs:
 
     - name: Wait for server to start
       run: sleep 5
-
-
-
-
-    - name: Compile Typescript
-      run: tsc
-      working-directory: ts-test
 
     - name: Setup for Typescript
       run: |
         npm i --save-dev @types/mocha;
         npm i --save-dev @types/yargs;
         npm i --save-dev @types/semver;
         npm i --save-dev @types/chai;
-        npm install aerospike
+        npm install aerospike;
+        tsc;
       working-directory: ts-test
 
     - name: Run tests