Propagate forward the GITHUB_ENV file

Author: award999

.github/workflows/nightly.yml

@@ -67,7 +67,8 @@ jobs:
         CI=1
         VSCODE_SWIFT_VSIX_ID=${{needs.package.outputs.artifact-id}}
         GITHUB_REPOSITORY=${{github.repository}}
-      windows_pre_build_command: .github\workflows\scripts\windows\setup.ps1
+        GITHUB_ENV=${{github.env}}
+      windows_pre_build_command: . .github\workflows\scripts\windows\setup.ps1
       windows_build_command: scripts\test_windows.ps1
       enable_windows_docker: false
 
@@ -98,6 +99,7 @@ jobs:
         VSCODE_SWIFT_VSIX_ID=${{needs.package.outputs.artifact-id}}
         VSCODE_SWIFT_VSIX_PRERELEASE=1
         GITHUB_REPOSITORY=${{github.repository}}
-      windows_pre_build_command: .github\workflows\scripts\windows\setup.ps1
+        GITHUB_ENV=${{github.env}}
+      windows_pre_build_command: . .github\workflows\scripts\windows\setup.ps1
       windows_build_command: scripts\test_windows.ps1
       enable_windows_docker: false

.github/workflows/pull_request.yml

@@ -67,7 +67,8 @@ jobs:
         FAST_TEST_RUN=${{ contains(github.event.pull_request.labels.*.name, 'full-test-run') && '0' || '1'}}
         VSCODE_SWIFT_VSIX_ID=${{needs.package.outputs.artifact-id}}
         GITHUB_REPOSITORY=${{github.repository}}
-      windows_pre_build_command: .github\workflows\scripts\windows\setup.ps1
+        GITHUB_ENV=${{github.env}}
+      windows_pre_build_command: . .github\workflows\scripts\windows\setup.ps1
       windows_build_command: scripts\test_windows.ps1
       enable_windows_docker: false
 

.github/workflows/scripts/windows/setup.ps1

@@ -10,3 +10,8 @@ if ($Process.ExitCode -eq 0) {
     Write-Host  ('FAILED ({0})' -f $Process.ExitCode)
     exit 1
 }
+
+Get-Content $env:GITHUB_ENV | foreach {
+    $name, $value = $_.split('=')
+    Set-Content env:\$name $value
+}

.vscode-test.js

@@ -41,27 +41,33 @@ if (process.platform === "darwin" && process.arch === "x64") {
     launchArgs.push("--disable-gpu");
 }
 
-// https://github.com/swiftlang/vscode-swift/issues/1751
-// Will install extensions before CI tests run
 const installExtensions = [];
-
 let vsixPath = process.env["VSCODE_SWIFT_VSIX"];
+let versionStr = version;
+let extensionDevelopmentPath;
 if (vsixPath) {
+    // https://github.com/swiftlang/vscode-swift/issues/1751
+    // Will install extensions before CI tests run
     installExtensions.push("vadimcn.vscode-lldb", "llvm-vs-code-extensions.lldb-dap");
+
+    // Absolute path to vsix needed
     if (!path.isAbsolute(vsixPath)) {
         vsixPath = path.join(__dirname, vsixPath);
     }
-    console.log("Installing " + vsixPath);
+    console.log("Installing VSIX " + vsixPath);
     installExtensions.push(vsixPath);
-}
-let versionStr = version;
-if (vsixPath) {
+
+    // Determine version to use
     const match = /swift-vscode-(\d+.\d+.\d+(-dev)?)(-\d+)?.vsix/g.exec(path.basename(vsixPath));
     if (match) {
         versionStr = match[1];
     }
+    console.log("Running tests against extension version " + versionStr);
+
+    extensionDevelopmentPath = vsixPath
+        ? [`${__dirname}/.vscode-test/extensions/${publisher}.${name}-${versionStr}`]
+        : undefined;
 }
-console.log("Running tests against extension version " + versionStr);
 
 const vscodeVersion = process.env["VSCODE_VERSION"] ?? "stable";
 console.log("Running tests against VS Code version " + vscodeVersion);
@@ -79,6 +85,10 @@ for (const ext of installExtensions) {
     });
 }
 
+const env = {
+    VSCODE_TEST: "1",
+};
+
 module.exports = defineConfig({
     tests: [
         ...installConfigs,
@@ -88,12 +98,8 @@ module.exports = defineConfig({
             version: vscodeVersion,
             workspaceFolder: "./assets/test",
             launchArgs,
-            extensionDevelopmentPath: vsixPath
-                ? [`${__dirname}/.vscode-test/extensions/${publisher}.${name}-${versionStr}`]
-                : undefined,
-            env: {
-                VSCODE_TEST: "1",
-            },
+            extensionDevelopmentPath,
+            env,
             mocha: {
                 ui: "tdd",
                 color: true,
@@ -127,12 +133,8 @@ module.exports = defineConfig({
             version: vscodeVersion,
             workspaceFolder: "./assets/test.code-workspace",
             launchArgs,
-            extensionDevelopmentPath: vsixPath
-                ? [`${__dirname}/.vscode-test/extensions/${publisher}.${name}-${versionStr}`]
-                : undefined,
-            env: {
-                VSCODE_TEST: "1",
-            },
+            extensionDevelopmentPath,
+            env,
             mocha: {
                 ui: "tdd",
                 color: true,
@@ -157,9 +159,7 @@ module.exports = defineConfig({
             files: ["dist/test/common.js", "dist/test/unit-tests/**/*.test.js"],
             version: vscodeVersion,
             launchArgs: launchArgs.concat("--disable-extensions"),
-            env: {
-                VSCODE_TEST: "1",
-            },
+            env,
             mocha: {
                 ui: "tdd",
                 color: true,

scripts/download_vsix.ts

@@ -15,7 +15,7 @@
 
 import * as DecompressType from "decompress";
 import { createWriteStream } from "node:fs";
-import { appendFile, unlink } from "node:fs/promises";
+import { appendFile, readFile, unlink } from "node:fs/promises";
 import { pipeline } from "node:stream/promises";
 import { Octokit } from "octokit";
 
@@ -89,5 +89,6 @@ const repo = repository.split("/")[1];
             process.exit(1);
         }
     }
+    console.log((await readFile(envFile)).toString("utf-8"));
     await unlink("artifacts.zip");
 })();