Correctly delete binary for CI tests

Author: timfish

.github/workflows/ci.yml

@@ -412,10 +412,12 @@ jobs:
     name: Test (recompile from source) (v${{ matrix.node }}) ${{ matrix.os }}
     needs: [job_build]
     runs-on: ${{ matrix.os }}
+    env:
+      DELETE_BINARIES: true
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-late4st, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
         node: [18, 26]
     steps:
       - name: Check out current commit
@@ -430,8 +432,6 @@ jobs:
         uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
         with:
           name: ${{ github.sha }}
-      - name: Clear binaries
-        run: yarn clean:binaries
       - name: Run tests
         run: yarn test
 

package.json

@@ -32,7 +32,6 @@
     "build:bindings:arm64": "yarn build:lib && node-gyp build --arch=arm64 && yarn build:copy-binary",
     "build:tarball": "npm pack",
     "clean": "node-gyp clean && rm -rf lib && rm -rf build && rm -f *.tgz",
-    "clean:binaries": "node -e \"require('fs').readdirSync('lib').filter(f=>f.endsWith('.node')).forEach(f=>require('fs').rmSync('lib/'+f))\"",
     "test": "node ./test/prepare.mjs && vitest run --poolOptions.forks.singleFork --silent=false --disable-console-intercept"
   },
   "gypfile": false,

test/e2e.test.mjs

@@ -7,7 +7,7 @@ const __dirname = import.meta.dirname || new URL('.', import.meta.url).pathname;
 const NODE_MAJOR_VERSION = parseInt(process.versions.node.split('.')[0], 10);
 
 // macOS emulated x64 in CI is very slow!
-const timeout = process.env.CI && process.platform === 'darwin' ? 60000 : 20000;
+const timeout = (process.env.CI && process.platform === 'darwin') || process.env.DELETE_BINARIES ? 60000 : 20000;
 
 async function runTest(...paths) {
   console.time('Test Run');

test/prepare.mjs

@@ -1,5 +1,5 @@
 import { execSync, spawnSync } from 'node:child_process';
-import { existsSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { existsSync, readdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import { dirname, join, relative } from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -40,6 +40,16 @@ function installTarballAsDependency(root) {
 
   console.log('Installing dependencies...');
   execSync('yarn install', { cwd: root, stdio: 'inherit' });
+
+  // For recompile from source tests, we need to ensure the pre-built binaries are removed
+  if (process.env.DELETE_BINARIES) {
+    const unpackedDir = join(root, 'node_modules', '@sentry/node-native-stacktrace', 'lib');
+    readdirSync(unpackedDir).forEach(file => {
+      if (file.endsWith('.node')) {
+        rmSync(join(unpackedDir, file));
+      }
+    });
+  }
 }
 
 installTarballAsDependency(__dirname);