fix: prevent conflict between binaries

Author: aminya

.github/workflows/CI.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - master
+      - backport/*
   pull_request:
 
 jobs:

src/main.ts

@@ -73,12 +73,18 @@ async function main(): Promise<void> {
     console.log("[ DONE ]")
 
     process.stdout.write("> Building directories... ")
-    const stagingDir = resolve(
-      join(configs.stagingDirectory, config.os, config.arch, config.runtime, `${dist.abi()}`, config.addonSubdirectory),
-    )
-    const targetDir = resolve(
-      join(configs.targetDirectory, config.os, config.arch, config.runtime, `${dist.abi()}`, config.addonSubdirectory),
+
+    const subDirectory = join(
+      config.os,
+      config.arch,
+      config.runtime,
+      `${config.libc}-${dist.abi()}-${configs.buildType}`,
+      config.addonSubdirectory,
     )
+
+    const stagingDir = resolve(join(configs.stagingDirectory, subDirectory))
+    const targetDir = resolve(join(configs.targetDirectory, subDirectory))
+
     console.log("[ DONE ]")
 
     process.stdout.write("> Applying overrides... ")

test/zeromq.test.ts

@@ -47,8 +47,6 @@ suite("zeromq", { timeout: 300_000 }, (tests) => {
         cwd: zeromqPath,
       })
 
-      const addonPath = `${process.platform}/${process.arch}/node/131/addon.node`
-
       // check manifest file
       const manifestPath = join(zeromqPath, "build/manifest.json")
       expect(existsSync(manifestPath), `Manifest file ${manifestPath} does not exist`).toBe(true)
@@ -71,6 +69,14 @@ suite("zeromq", { timeout: 300_000 }, (tests) => {
         libc: configKey.libc,
       }
 
+      const addonPath = join(
+        process.platform,
+        process.arch,
+        "node",
+        `${configKey.libc}-${configKey.abi}`,
+        "addon.node",
+      )
+
       expect(manifest).toEqual({
         [JSON.stringify(expectedConfig)]: addonPath,
       })