Don't always check for pre-release VSIX

Author: award999

scripts/download_vsix.ts

@@ -65,31 +65,29 @@ const repo = repository.split("/")[1];
     await pipeline(data, createWriteStream("artifacts.zip", data));
     const files = await decompress("artifacts.zip", process.cwd());
     console.log(`Downloaded artifact(s): ${files.map(f => f.path).join(", ")}`);
-    // const newName = process.env["VSCODE_SWIFT_VSIX"] || "vscode-swift.vsix";
-    const releaseVSIX = files.find(f => /swift-vscode-\d+.\d+.\d+(-dev)?-\d+.vsix/m.test(f.path));
-    if (!releaseVSIX) {
-        console.error("Cound not find vscode-swift release VSIX in artifact bundle");
-        process.exit(1);
-    }
-    // await rename(releaseVSIX.path, newName);
-    const prereleaseVSIX = files.find(f =>
-        /swift-vscode-\d+.\d+.\d{8}(-dev)?-\d+.vsix/m.test(f.path)
-    );
-    if (!prereleaseVSIX) {
-        console.error("Cound not find vscode-swift pre-release VSIX in artifact bundle");
-        process.exit(1);
-    }
-    // console.log(`Renamed artifact: ${releaseVSIX.path} => ${newName}`);
-    // const preNewName =
-    //     process.env["VSCODE_SWIFT_PRERELEASE_VSIX"] || "vscode-swift-prerelease.vsix";
-    // await rename(prereleaseVSIX.path, preNewName);
-    // console.log(`Renamed artifact: ${prereleaseVSIX.path} => ${preNewName}`);
-    if (process.env["VSCODE_SWIFT_VSIX_PRERELEASE"] === "1") {
-        await appendFile(envFile, `VSCODE_SWIFT_VSIX=${prereleaseVSIX.path}\n`);
-        console.log(`Running tests against: ${prereleaseVSIX.path}`);
+    const testPrerelease = process.env["VSCODE_SWIFT_VSIX_PRERELEASE"] === "1";
+    if (testPrerelease) {
+        const prereleaseVSIX = files.find(f =>
+            /swift-vscode-\d+.\d+.\d{8}(-dev)?-\d+.vsix/m.test(f.path)
+        );
+        if (prereleaseVSIX) {
+            await appendFile(envFile, `VSCODE_SWIFT_VSIX=${prereleaseVSIX.path}\n`);
+            console.log(`Running tests against: ${prereleaseVSIX.path}`);
+        } else {
+            console.error("Cound not find vscode-swift pre-release VSIX in artifact bundle");
+            process.exit(1);
+        }
     } else {
-        await appendFile(envFile, `VSCODE_SWIFT_VSIX=${releaseVSIX.path}\n`);
-        console.log(`Running tests against: ${releaseVSIX.path}`);
+        const releaseVSIX = files.find(f =>
+            /swift-vscode-\d+.\d+.\d+(-dev)?-\d+.vsix/m.test(f.path)
+        );
+        if (releaseVSIX) {
+            await appendFile(envFile, `VSCODE_SWIFT_VSIX=${releaseVSIX.path}\n`);
+            console.log(`Running tests against: ${releaseVSIX.path}`);
+        } else {
+            console.error("Cound not find vscode-swift release VSIX in artifact bundle");
+            process.exit(1);
+        }
     }
     await unlink("artifacts.zip");
 })();