updated pipeline

aerospike · Feb 14, 2024 · 10e8406 · 10e8406
1 parent 074c5dd
commit 10e8406
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml
@@ -463,7 +463,7 @@ jobs:
         mkdir -p testDir lib/binding/openssl@3/ lib/binding/openssl@1/
         cd testDir
         npm install --global yarn
-        yarn add ..
+        yarn add file:..
 
   test-pnpm-install:
     runs-on: ubuntu-latest
@@ -487,9 +487,9 @@ jobs:
 
     - name: Run tests
       run: |
-        mkdir -p testDir lib/binding/openssl@3/ lib/binding/openssl@1/
+        mkdir -p testDir 
         cd testDir
-        apt install wget
+        sudo apt install wget
         wget -qO- https://get.pnpm.io/install.sh | sh -
         pnpm install ..
 
@@ -515,10 +515,11 @@ jobs:
 
     - name: Run tests
       run: |
-        mkdir -p testDir lib/binding/openssl@3/ lib/binding/openssl@1/
+        npm install -g bun
+        bun link       
+        mkdir -p testDir 
         cd testDir
-        npm install -g bun 
-        bun install ..
+        bun link aerospike
 
   test-typescript-install:
     runs-on: ubuntu-latest
@@ -536,6 +537,11 @@ jobs:
         architecture: 'x64'
 
     - name: Modify the package.json
+      run: |
+        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
@@ -546,10 +552,4 @@ jobs:
         npx tsc index.ts
         node index.js
 
-    - name: Run tests
-      run: |
-        mkdir -p testDir lib/binding/openssl@3/ lib/binding/openssl@1/
-        cd testDir
-        bun install ..
-
 
diff --git a/.github/workflows/combine-bindings/action.yml b/.github/workflows/combine-bindings/action.yml
@@ -62,9 +62,10 @@ runs:
         mkdir -p lib/binding/node-v108-darwin-arm64 lib/binding/node-v115-darwin-arm64 lib/binding/node-v120-darwin-arm64
         mkdir -p lib/binding/openssl@3/node-v108-linux-arm64 lib/binding/openssl@3/node-v115-linux-arm64 lib/binding/openssl@3/node-v120-linux-arm64
         mkdir -p lib/binding/openssl@1/node-v108-linux-arm64 lib/binding/openssl@1/node-v115-linux-arm64 lib/binding/openssl@1/node-v120-linux-arm64
-        cp -r node-v108-linux-x64 lib/binding/node-v108-linux-x64
-        cp -r node-v115-linux-x64 lib/binding/node-v115-linux-x64
-        cp -r node-v120-linux-x64 lib/binding/node-v120-linux-x64
+        mkdir -p lib/binding/openssl@1/node-v108-linux-x64 lib/binding/openssl@1/node-v115-linux-x64 lib/binding/openssl@1/node-v120-linux-x64        
+        cp -r node-v108-linux-x64 lib/binding/openssl@3/node-v108-linux-x64
+        cp -r node-v115-linux-x64 lib/binding/openssl@3/node-v115-linux-x64
+        cp -r node-v120-linux-x64 lib/binding/openssl@3/node-v120-linux-x64
         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-v120-darwin-x64 lib/binding/node-v120-darwin-x64