From 62674fbcddd636bc810624455bb8f8007314fedf Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Fri, 1 Sep 2023 11:23:25 -0700 Subject: [PATCH] tests: skip some msvc installation tests based on the Windows version --- .github/workflows/CI.yml | 2 + src/msvc/__tests__/msvc.test.ts | 73 ++++++++++----------------------- src/utils/tests/test-helpers.ts | 12 ++++++ 3 files changed, 35 insertions(+), 52 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 2ae7eee5..b3525e5f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -193,6 +193,8 @@ jobs: - name: Tests run: | pnpm run test + env: + RUNNER_OS_NAME: ${{ matrix.os }} - name: Setup Node 12 uses: actions/setup-node@v3 diff --git a/src/msvc/__tests__/msvc.test.ts b/src/msvc/__tests__/msvc.test.ts index 150e943c..c18f9783 100644 --- a/src/msvc/__tests__/msvc.test.ts +++ b/src/msvc/__tests__/msvc.test.ts @@ -1,70 +1,39 @@ import which from "which" import { setupMSVC } from "../msvc" +import { runnerWindowsVersion } from "../../utils/tests/test-helpers" +import { warning } from "ci-log" jest.setTimeout(300000) describe("setup-msvc", () => { + const isWindows = process.platform === "win32" + it("should setup the pre-installed msvc", async () => { try { - if (process.platform !== "win32") { + if (!isWindows) { return } await setupMSVC("", "", process.arch) console.log(which.sync("cl")) - } catch (e) { - // TODO - console.error(e) + } catch (err) { + if ("toString" in (err as any)) { + warning((err as any).toString()) + } } }) - it("should setup msvc 2022", async () => { - try { - if (process.platform !== "win32") { + for (const version of [2022, 2019, 2017, 2015]) { + it(`should setup msvc ${version}`, async () => { + if (!isWindows || (runnerWindowsVersion() !== undefined && runnerWindowsVersion()! > version)) { return } - await setupMSVC("2022", "", process.arch) - console.log(which.sync("cl")) - } catch (e) { - // TODO - console.error(e) - } - }) - - it("should setup msvc 2019", async () => { - try { - if (process.platform !== "win32") { - return + try { + await setupMSVC(`${version}`, "", process.arch) + console.log(which.sync("cl")) + } catch (err) { + if ("toString" in (err as any)) { + warning((err as any).toString()) + } } - await setupMSVC("2019", "", process.arch) - console.log(which.sync("cl")) - } catch (e) { - // TODO - console.error(e) - } - }) - - it("should setup msvc 2017", async () => { - try { - if (process.platform !== "win32") { - return - } - await setupMSVC("2017", "", process.arch) - console.log(which.sync("cl")) - } catch (e) { - // TODO - console.error(e) - } - }) - - it("should setup msvc 2015", async () => { - try { - if (process.platform !== "win32") { - return - } - await setupMSVC("2015", "", process.arch) - console.log(which.sync("cl")) - } catch (e) { - // TODO - console.error(e) - } - }) + }) + } }) diff --git a/src/utils/tests/test-helpers.ts b/src/utils/tests/test-helpers.ts index ab198d15..544153e7 100644 --- a/src/utils/tests/test-helpers.ts +++ b/src/utils/tests/test-helpers.ts @@ -56,3 +56,15 @@ export async function testBin( throw new Error(`Failed to test bin ${name}: ${err}`) } } + +export function runnerWindowsVersion() { + if (process.platform !== "win32") { + return undefined + } + const maybeVersionString = process.env.RUNNER_OS_NAME?.split("-")[1] + if (maybeVersionString === undefined) { + return undefined + } + + return parseInt(maybeVersionString, 10) +}