Ensure integration tests test the platform-specific bundle

Author: pimterry

pack.ts

@@ -70,6 +70,15 @@ const packageApp = async () => {
     await fs.remove(path.join(OUTPUT_DIR, 'nss', 'darwin'));
     await fs.copy(path.join(__dirname, 'nss', 'win32'), path.join(OUTPUT_DIR, 'nss', 'win32'));
     await spawn(buildScript, ['win32'], { cwd: OUTPUT_DIR, stdio: 'inherit' });
+
+    // Oclif builds a nodeless platform-agnostic bundle too (although in our case, nothing is
+    // really platform agnostic). Not necessary, probably won't work - drop it.
+    await fs.remove(path.join(
+        OUTPUT_DIR,
+        'dist',
+        `v${pjson.version}`,
+        `httptoolkit-server-v${pjson.version}.tar.gz`
+    ));
 }
 
 packageApp().catch((error: any) => {

test/integration-test.spec.ts

@@ -18,7 +18,7 @@ async function setupServerPath() {
         return path.join(__dirname, '..', 'bin', 'run');
     }
 
-    // If TEST_BUILT_TARBALL is set, test the latest build ready-to-go tarball:
+    // If TEST_BUILT_TARBALL is set, test the latest built ready-to-go tarball:
     const tmpDir = tmp.dirSync({ unsafeCleanup: true }).name;
     const version = require(path.join('..', 'package.json')).version;
     const tarballPath = path.join(
@@ -27,7 +27,7 @@ async function setupServerPath() {
         'build',
         'dist',
         `v${version}`,
-        `httptoolkit-server-v${version}.tar.gz`
+        `httptoolkit-server-v${version}-${process.platform}-${process.arch}.tar.gz`
     );
 
     console.log('Extracting built tarball to', tmpDir);